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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
155 } 189 }
156
157 $widget->reconfigure;
158 } 190 }
191
192 reconfigure_widgets;
159} 193}
160 194
161############################################################################# 195#############################################################################
162 196
163package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
168 202
169sub new { 203sub new {
170 my $class = shift; 204 my $class = shift;
171 205
172 my $self = bless { 206 my $self = bless {
173 x => 0, 207 x => "center",
174 y => 0, 208 y => "center",
175 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
176 can_events => 1, 212 can_events => 1,
177 @_ 213 @_
178 }, $class; 214 }, $class;
179 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
180 for (keys %$self) { 218 for (keys %$self) {
181 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
183 } 221 }
184 } 222 }
185 223
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
187 235
188 $self 236 $self
189} 237}
190 238
191sub destroy { 239sub destroy {
… …
201 return if $self->{parent}; 249 return if $self->{parent};
202 250
203 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
204} 252}
205 253
206sub hide { 254sub set_visible {
207 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
208 278
209 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
211 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
212 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
213 if $self->{parent}; 313 if $self->{parent};
214} 314}
215 315
216sub move { 316sub move_abs {
217 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
218 318
219 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
220 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
221 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
222 322
223 $self->update; 323 $self->update;
224} 324}
225 325
226sub set_size { 326sub set_size {
227 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
228 328
229 $self->{user_w} = $w; 329 $self->{force_w} = $w;
230 $self->{user_h} = $h; 330 $self->{force_h} = $h;
231 331
232 $self->check_size; 332 $self->realloc;
233} 333}
234 334
235sub size_request { 335sub size_request {
236 require Carp; 336 require Carp;
237 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
239 339
240sub configure { 340sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
242 342
243 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
246 348
247 # use alignment to adjust x, y 349 # use alignment to adjust x, y
248 350
249 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 353 }
254 354
255 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 356 $self->{x} = $x;
257 $self->{y} = $y; 357 $self->{y} = $y;
258 $self->update; 358 $self->update;
259 } 359 }
260 360
261 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
263 } 368 }
264} 369}
265 370
266sub size_allocate { 371sub size_allocate {
267 # nothing to be done 372 # nothing to be done
268} 373}
269 374
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 375sub children {
278} 376}
279 377
280sub set_max_size { 378sub set_max_size {
281 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
282 380
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
383}
384
385sub set_tooltip {
386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
285} 399}
286 400
287# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
288sub coord2local { 402sub coord2local {
289 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
304 return if $FOCUS == $self; 418 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
306 420
307 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
308 422
309 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
310 424
311 $focus->update if $focus; 425 $focus->update if $focus;
312 $FOCUS->update; 426 $FOCUS->update;
313} 427}
314 428
… …
317 431
318 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
319 433
320 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
321 435
322 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
323 437
324 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
325} 442}
326 443
327sub mouse_motion { } 444sub mouse_motion { }
328sub button_up { } 445sub button_up { }
329sub key_down { } 446sub key_down { }
330sub key_up { } 447sub key_up { }
331 448
332sub button_down { 449sub button_down {
333 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
334 451
335 $self->focus_in; 452 $self->focus_in;
336} 453}
337 454
338sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
339sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
340sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
341sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
342sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
343 528
344sub draw { 529sub draw {
345 my ($self) = @_; 530 my ($self) = @_;
346 531
347 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y};
536
537 return if $draw_x + $self->{w} < 0;
538 return if $draw_x >= $draw_w;
539 return if $draw_y + $self->{h} < 0;
540 return if $draw_y >= $draw_h;
348 541
349 glPushMatrix; 542 glPushMatrix;
350 glTranslate $self->{x}, $self->{y}, 0; 543 glTranslate $self->{x}, $self->{y}, 0;
351 $self->_draw; 544 $self->_draw;
352 glPopMatrix; 545 glPopMatrix;
… …
364 glVertex $x , $y + $self->{h}; 557 glVertex $x , $y + $self->{h};
365 glEnd; 558 glEnd;
366 glDisable GL_BLEND; 559 glDisable GL_BLEND;
367 } 560 }
368 561
369 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
370 glPushMatrix; 563 glPushMatrix;
371 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0; 567 glVertex 0 , 0;
375 glVertex $self->{w}, 0; 568 glVertex $self->{w} - 1, 0;
376 glVertex $self->{w}, $self->{h}; 569 glVertex $self->{w} - 1, $self->{h} - 1;
377 glVertex 0 , $self->{h}; 570 glVertex 0 , $self->{h} - 1;
378 glEnd; 571 glEnd;
379 glPopMatrix; 572 glPopMatrix;
380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 } 574 }
382} 575}
… …
385 my ($self) = @_; 578 my ($self) = @_;
386 579
387 warn "no draw defined for $self\n"; 580 warn "no draw defined for $self\n";
388} 581}
389 582
390sub find_widget {
391 my ($self, $x, $y) = @_;
392
393 return () unless $self->{can_events};
394
395 return $self
396 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
397 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
398
399 ()
400}
401
402sub set_parent {
403 my ($self, $parent) = @_;
404
405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
410}
411
412sub check_size {
413 my ($self, $forced) = @_;
414
415 $self->{force_alloc} = 1 if $forced;
416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
417}
418
419sub update {
420 my ($self) = @_;
421
422 $self->{parent}->update
423 if $self->{parent};
424}
425
426sub connect {
427 my ($self, $signal, $cb) = @_;
428
429 push @{ $self->{signal_cb}{$signal} }, $cb;
430}
431
432sub emit {
433 my ($self, $signal, @args) = @_;
434
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
436}
437
438sub DESTROY { 583sub DESTROY {
439 my ($self) = @_; 584 my ($self) = @_;
440 585
441 delete $WIDGET{$self+0}; 586 delete $WIDGET{$self+0};
442 #$self->deactivate; 587 #$self->deactivate;
… …
455 my $class = shift; 600 my $class = shift;
456 601
457 # range [value, low, high, page] 602 # range [value, low, high, page]
458 603
459 $class->SUPER::new ( 604 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 605 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 606 #active_bg => [1, 1, 1, 0.5],
462 @_ 607 @_
463 ) 608 )
464} 609}
465 610
466sub _draw { 611sub _draw {
467 my ($self) = @_; 612 my ($self) = @_;
468 613
614 my $color = $FOCUS == $self && $self->{active_bg}
615 ? $self->{active_bg}
616 : $self->{bg};
617
618 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 619 my ($w, $h) = @$self{qw(w h)};
470 620
471 glEnable GL_BLEND; 621 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 623 glColor @$color;
474 624
475 glBegin GL_QUADS; 625 glBegin GL_QUADS;
476 glVertex 0 , 0; 626 glVertex 0 , 0;
477 glVertex 0 , $h; 627 glVertex 0 , $h;
478 glVertex $w, $h; 628 glVertex $w, $h;
479 glVertex $w, 0; 629 glVertex $w, 0;
480 glEnd; 630 glEnd;
481 631
482 glDisable GL_BLEND; 632 glDisable GL_BLEND;
633 }
483} 634}
484 635
485############################################################################# 636#############################################################################
486 637
487package CFClient::UI::Empty; 638package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 643 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 644 $class->SUPER::new (can_events => 0, %arg);
494} 645}
495 646
496sub size_request { 647sub size_request {
497 (0, 0) 648 my ($self) = @_;
649
650 ($self->{w} + 0, $self->{h} + 0)
498} 651}
499 652
500sub draw { } 653sub draw { }
501 654
502############################################################################# 655#############################################################################
… …
531 $self->{children} = [ 684 $self->{children} = [
532 sort { $a->{z} <=> $b->{z} } 685 sort { $a->{z} <=> $b->{z} }
533 @{$self->{children}}, @widgets 686 @{$self->{children}}, @widgets
534 ]; 687 ];
535 688
536 $self->check_size (1); 689 $self->realloc;
537 $self->update;
538} 690}
539 691
540sub children { 692sub children {
541 @{ $_[0]{children} } 693 @{ $_[0]{children} }
542} 694}
… …
547 delete $child->{parent}; 699 delete $child->{parent};
548 $child->hide; 700 $child->hide;
549 701
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 702 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551 703
552 $self->check_size; 704 $self->realloc;
553 $self->update;
554} 705}
555 706
556sub clear { 707sub clear {
557 my ($self) = @_; 708 my ($self) = @_;
558 709
… …
562 for (@$children) { 713 for (@$children) {
563 delete $_->{parent}; 714 delete $_->{parent};
564 $_->hide; 715 $_->hide;
565 } 716 }
566 717
567 $self->check_size; 718 $self->realloc;
568 $self->update;
569} 719}
570 720
571sub find_widget { 721sub find_widget {
572 my ($self, $x, $y) = @_; 722 my ($self, $x, $y) = @_;
573 723
… …
660 $self->SUPER::size_allocate ($w, $h); 810 $self->SUPER::size_allocate ($w, $h);
661 $self->update; 811 $self->update;
662} 812}
663 813
664sub _render { 814sub _render {
815 my ($self) = @_;
816
665 $_[0]{children}[0]->draw; 817 $self->{children}[0]->draw;
666} 818}
667 819
668sub render_child { 820sub render_child {
669 my ($self) = @_; 821 my ($self) = @_;
670 822
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 823 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0; 824 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 825 glClear GL_COLOR_BUFFER_BIT;
674 826
827 {
828 package CFClient::UI::Base;
829
830 ($draw_x, $draw_y, $draw_w, $draw_h) =
831 (0, 0, $self->{w}, $self->{h});
832 }
833
675 $self->_render; 834 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 835 };
684} 836}
685 837
686sub _draw { 838sub _draw {
687 my ($self) = @_; 839 my ($self) = @_;
688 840
689 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
690 842
691 my $tex = $self->{texture} 843 my $tex = $self->{texture}
692 or return; 844 or return;
693 845
694 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 848 glColor 1, 1, 1, 1;
697 849
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 851
700 glDisable GL_TEXTURE_2D; 852 glDisable GL_TEXTURE_2D;
701} 853}
… …
704 856
705package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
706 858
707our @ISA = CFClient::UI::Window::; 859our @ISA = CFClient::UI::Window::;
708 860
861sub new {
862 my $class = shift;
863
864 $class->SUPER::new (
865 scroll_x => 0,
866 scroll_y => 1,
867 @_,
868 )
869}
870
709sub size_request { 871sub size_request {
710 my ($self) = @_; 872 my ($self) = @_;
711 873
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 875
715 @$self{qw(child_w child_h)} 876 $w = 10 if $self->{scroll_x};
877 $h = 10 if $self->{scroll_y};
878
879 ($w, $h)
716} 880}
717 881
718sub size_allocate { 882sub size_allocate {
719 my ($self, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
720 884
885 my $child = $self->child;
886
887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889
890 $self->child->configure (0, 0, $w, $h);
721 $self->update; 891 $self->update;
722} 892}
723 893
724sub set_offset { 894sub set_offset {
725 my ($self, $x, $y) = @_; 895 my ($self, $x, $y) = @_;
… …
759} 929}
760 930
761sub _render { 931sub _render {
762 my ($self) = @_; 932 my ($self) = @_;
763 933
934 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
935 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
936
764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
765 938
766 $self->SUPER::_render; 939 $self->SUPER::_render;
767} 940}
768 941
… …
776 my $class = shift; 949 my $class = shift;
777 950
778 my $self; 951 my $self;
779 952
780 my $slider = new CFClient::UI::Slider 953 my $slider = new CFClient::UI::Slider
781 vertical => 1, 954 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 955 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 956 on_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 957 $self->{vp}->set_offset (0, $_[1]);
785 }, 958 },
786 ; 959 ;
787 960
788 $self = $class->SUPER::new ( 961 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 962 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 963 slider => $slider,
791 @_, 964 @_,
792 ); 965 );
793 966
794 $self->{vp}->add ($self->{scrolled}); 967 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp}); 968 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 969 $self->add ($self->{slider});
797 970
798 $self 971 $self
972}
973
974sub update {
975 my ($self) = @_;
976
977 $self->SUPER::update;
978
979 # todo: overwrite size_allocate of child
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982}
983
984sub size_allocate {
985 my ($self, $w, $h) = @_;
986
987 $self->SUPER::size_allocate ($w, $h);
988
989 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799} 991}
800 992
801#TODO# update range on size_allocate depending on child 993#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 994# update viewport offset on scroll
803 995
… …
847 1039
848our @ISA = CFClient::UI::Bin::; 1040our @ISA = CFClient::UI::Bin::;
849 1041
850use CFClient::OpenGL; 1042use CFClient::OpenGL;
851 1043
852my @tex = 1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
854 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
855 1051
856sub new { 1052sub new {
857 my $class = shift; 1053 my $class = shift;
858 1054
859 # TODO: user_x, user_y, overwrite moveto?
860
861 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
864 border => 0.6, 1058 border => 0.6,
865 toplevel => 1,
866 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
867 @_ 1062 @_
868 ); 1063 );
869 1064
870 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
871 align => 0, 1066 align => 0,
… …
924 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
925 1120
926 my $dx = $ev->{x} - $ox; 1121 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy; 1122 my $dy = $ev->{y} - $oy;
928 1123
929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126
1127 $self->realloc;
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
932 $self->check_size;
933 }; 1129 };
934 1130
935 } elsif ($lr ^ $td) { 1131 } elsif ($lr ^ $td) {
936 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
937 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
… …
939 $self->{motion} = sub { 1135 $self->{motion} = sub {
940 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
941 1137
942 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
943 1139
944 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
945 $self->update;
946 }; 1141 };
947 } 1142 }
948} 1143}
949 1144
950sub button_up { 1145sub button_up {
… …
969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
970 1165
971 my $border = $self->border; 1166 my $border = $self->border;
972 1167
973 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
974 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
978 1173
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
980 my $bg = $tex[0]; 1175 glColor @{ $self->{bg} };
981 1176
982 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
1178 # solve this better(?)
983 my $rep_x = $cw / $bg->{w}; 1179 $bg->{s} = $cw / $bg->{w};
984 my $rep_y = $ch / $bg->{h}; 1180 $bg->{t} = $ch / $bg->{h};
985
986 glColor @{ $self->{bg} };
987
988 $bg->{s} = $rep_x;
989 $bg->{t} = $rep_y;
990 $bg->{wrap_mode} = 1;
991 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 } 1182 }
993 1183
994 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
995 1185
… …
1011sub new { 1201sub new {
1012 my $class = shift; 1202 my $class = shift;
1013 1203
1014 $class->SUPER::new ( 1204 $class->SUPER::new (
1015 col_expand => [], 1205 col_expand => [],
1016 @_ 1206 @_,
1017 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018} 1212}
1019 1213
1020sub add { 1214sub add {
1021 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
1022 1216
1023 $child->set_parent ($self); 1217 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
1025 1219
1026 $child->check_size; 1220 $self->realloc;
1027} 1221}
1028 1222
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
1033# TODO: move to container class maybe? send childs a signal on removal? 1223# TODO: move to container class maybe? send children a signal on removal?
1034sub clear { 1224sub clear {
1035 my ($self) = @_; 1225 my ($self) = @_;
1036 1226
1037 my @children = $self->children; 1227 my @children = $self->children;
1038 delete $self->{children}; 1228 delete $self->{children};
… …
1040 for (@children) { 1230 for (@children) {
1041 delete $_->{parent}; 1231 delete $_->{parent};
1042 $_->hide; 1232 $_->hide;
1043 } 1233 }
1044 1234
1045 $self->update; 1235 $self->realloc;
1046} 1236}
1047 1237
1048sub get_wh { 1238sub get_wh {
1049 my ($self) = @_; 1239 my ($self) = @_;
1050 1240
… …
1081sub size_allocate { 1271sub size_allocate {
1082 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
1083 1273
1084 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
1085 1275
1086 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
1087 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
1088 1278
1089 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
1090 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
1091 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
1092 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
… …
1146 } 1336 }
1147} 1337}
1148 1338
1149############################################################################# 1339#############################################################################
1150 1340
1151package CFClient::UI::HBox; 1341package CFClient::UI::Box;
1152
1153# TODO: wrap into common Box base class
1154 1342
1155our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
1156 1344
1157sub size_request { 1345sub size_request {
1158 my ($self) = @_; 1346 my ($self) = @_;
1159 1347
1160 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
1161 1349 ? (
1162 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1163 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1164 (List::Util::max map $_->[1], @alloc), 1352 )
1165 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
1166} 1357}
1167 1358
1168sub size_allocate { 1359sub size_allocate {
1169 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
1170 1361
1171 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
1172
1173 my $children = $self->{children}; 1363 my $children = $self->{children};
1174 1364
1175 my @h = map $_->{req_w}, @$children; 1365 my @req;
1176 1366
1177 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
1178 1368 @req = ($space / (@$children || 1)) x @$children;
1179 if ($req_h > $h) {
1180 # ah well, not enough space
1181 $_ *= $h / $req_h for @h;
1182 } else { 1369 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1371 my $req = List::Util::sum @req;
1372
1373 if ($req > $space) {
1374 # ah well, not enough space
1375 $_ *= $space / $req for @req;
1376 } else {
1183 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1184 $exp ||= 1;
1185 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
1186 for (0 .. $#$children) { 1382 for 0 .. $#$children;
1187 my $child = $children->[$_];
1188
1189 my $alloc_h = $h[$_];
1190 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1191 $h[$_] = $alloc_h;
1192 } 1383 }
1193 } 1384 }
1194 1385
1195 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
1196 1387
1197 my $y = 0; 1388 my $pos = 0;
1198 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
1199 my $child = $children->[$_];
1200 my $h = $h[$_]; 1390 my $alloc = $req[$_];
1201 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1202 1392
1203 $y += $h; 1393 $pos += $alloc;
1204 } 1394 }
1205 1395
1206 1 1396 1
1207} 1397}
1208 1398
1209############################################################################# 1399#############################################################################
1210 1400
1401package CFClient::UI::HBox;
1402
1403our @ISA = CFClient::UI::Box::;
1404
1405sub new {
1406 my $class = shift;
1407
1408 $class->SUPER::new (
1409 vertical => 0,
1410 @_,
1411 )
1412}
1413
1414#############################################################################
1415
1211package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
1212 1417
1213# TODO: wrap into common Box base class
1214
1215our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
1216 1419
1217sub size_request { 1420sub new {
1218 my ($self) = @_; 1421 my $class = shift;
1219 1422
1220 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
1221 1424 vertical => 1,
1222 ( 1425 @_,
1223 (List::Util::max map $_->[0], @alloc),
1224 (List::Util::sum map $_->[1], @alloc),
1225 ) 1426 )
1226} 1427}
1227 1428
1228sub size_allocate {
1229 my ($self, $w, $h) = @_;
1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1233 my $children = $self->{children};
1234
1235 my @h = map $_->{req_h}, @$children;
1236
1237 my $req_h = List::Util::sum @h;
1238
1239 if ($req_h > $h) {
1240 # ah well, not enough space
1241 $_ *= $h / $req_h for @h;
1242 } else {
1243 my $exp = List::Util::sum map $_->{expand}, @$children;
1244 $exp ||= 1;
1245
1246 for (0 .. $#$children) {
1247 my $child = $children->[$_];
1248
1249 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1250 }
1251 }
1252
1253 CFClient::UI::harmonize \@h;
1254
1255 my $y = 0;
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258 my $h = $h[$_];
1259 $child->configure (0, $y, $w, $h);
1260
1261 $y += $h;
1262 }
1263
1264 1
1265}
1266
1267############################################################################# 1429#############################################################################
1268 1430
1269package CFClient::UI::Label; 1431package CFClient::UI::Label;
1270 1432
1271our @ISA = CFClient::UI::Base::; 1433our @ISA = CFClient::UI::DrawBG::;
1272 1434
1273use CFClient::OpenGL; 1435use CFClient::OpenGL;
1274 1436
1275sub new { 1437sub new {
1276 my ($class, %arg) = @_; 1438 my ($class, %arg) = @_;
1277 1439
1278 my $self = $class->SUPER::new ( 1440 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1441 fg => [1, 1, 1],
1442 #bg => none
1443 #active_bg => none
1280 #font => default_font 1444 #font => default_font
1281 #text => initial text 1445 #text => initial text
1282 #markup => initial narkup 1446 #markup => initial narkup
1447 #max_w => maximum pixel width
1448 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1449 layout => (new CFClient::Layout),
1284 fontsize => 1, 1450 fontsize => 1,
1285 align => -1, 1451 align => -1,
1286 valign => -1, 1452 valign => -1,
1287 padding => 2, 1453 padding_x => 2,
1454 padding_y => 2,
1288 can_events => 0, 1455 can_events => 0,
1289 %arg 1456 %arg
1290 ); 1457 );
1291 1458
1292 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
… …
1302 } 1469 }
1303 1470
1304 $self 1471 $self
1305} 1472}
1306 1473
1307sub escape { 1474sub escape($) {
1308 local $_ = $_[1]; 1475 local $_ = $_[0];
1309 1476
1310 s/&/&amp;/g; 1477 s/&/&amp;/g;
1311 s/>/&gt;/g; 1478 s/>/&gt;/g;
1312 s/</&lt;/g; 1479 s/</&lt;/g;
1313 1480
1314 $_[1] 1481 $_
1315} 1482}
1316 1483
1317sub update { 1484sub update {
1318 my ($self) = @_; 1485 my ($self) = @_;
1319 1486
… …
1328 $self->{text} = "T$text"; 1495 $self->{text} = "T$text";
1329 1496
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1331 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1332 1499
1500 $self->realloc;
1333 $self->update; 1501 $self->update;
1334 $self->check_size;
1335} 1502}
1336 1503
1337sub set_markup { 1504sub set_markup {
1338 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1339 1506
… …
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1510 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344 1511
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1346 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1347 1514
1515 $self->realloc;
1348 $self->update; 1516 $self->update;
1349 $self->check_size;
1350} 1517}
1351 1518
1352sub size_request { 1519sub size_request {
1353 my ($self) = @_; 1520 my ($self) = @_;
1354 1521
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1522 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1523 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1527
1359 my ($w, $h) = $self->{layout}->size; 1528 my ($w, $h) = $self->{layout}->size;
1360 1529
1361 if (exists $self->{template}) { 1530 if (exists $self->{template}) {
… …
1366 1535
1367 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1368 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1369 } 1538 }
1370 1539
1371 ( 1540 ($w, $h)
1372 $w + $self->{padding} * 2,
1373 $h + $self->{padding} * 2,
1374 )
1375} 1541}
1376 1542
1377sub size_allocate { 1543sub size_allocate {
1378 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1379 1545
1380 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1381} 1548}
1382 1549
1383sub set_fontsize { 1550sub set_fontsize {
1384 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1385 1552
1386 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1387 delete $self->{texture}; 1554 delete $self->{texture};
1388 1555
1389 $self->update; 1556 $self->realloc;
1390 $self->check_size;
1391} 1557}
1392 1558
1393sub _draw { 1559sub _draw {
1394 my ($self) = @_; 1560 my ($self) = @_;
1561
1562 $self->SUPER::_draw; # draw background, if applicable
1395 1563
1396 my $tex = $self->{texture} ||= do { 1564 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1565 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1566 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1567 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1571
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1573
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1406 : ($self->{w} - $tex->{w}) * 0.5); 1576 : ($self->{w} - $tex->{w}) * 0.5);
1407 1577
1408 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1410 : ($self->{h} - $tex->{h}) * 0.5); 1580 : ($self->{h} - $tex->{h}) * 0.5);
1411 1581
1412 $tex 1582 $tex
1413 }; 1583 };
1414 1584
… …
1443 active_fg => [0, 0, 0], 1613 active_fg => [0, 0, 0],
1444 can_hover => 1, 1614 can_hover => 1,
1445 can_focus => 1, 1615 can_focus => 1,
1446 valign => 0, 1616 valign => 0,
1447 can_events => 1, 1617 can_events => 1,
1618 #text => ...
1448 @_ 1619 @_
1449 ) 1620 )
1450} 1621}
1451 1622
1452sub _set_text { 1623sub _set_text {
… …
1462 $self->{text} = $text; 1633 $self->{text} = $text;
1463 1634
1464 $text =~ s/./*/g if $self->{hidden}; 1635 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1636 $self->{layout}->set_text ("$text ");
1466 1637
1467 $self->emit (changed => $self->{text}); 1638 $self->_emit (changed => $self->{text});
1468} 1639}
1469 1640
1470sub set_text { 1641sub set_text {
1471 my ($self, $text) = @_; 1642 my ($self, $text) = @_;
1472 1643
1473 $self->{cursor} = length $text; 1644 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1645 $self->_set_text ($text);
1475 $self->update; 1646
1476 $self->check_size; 1647 $self->realloc;
1477} 1648}
1478 1649
1479sub get_text { 1650sub get_text {
1480 $_[0]{text} 1651 $_[0]{text}
1481} 1652}
… …
1484 my ($self) = @_; 1655 my ($self) = @_;
1485 1656
1486 my ($w, $h) = $self->SUPER::size_request; 1657 my ($w, $h) = $self->SUPER::size_request;
1487 1658
1488 ($w + 1, $h) # add 1 for cursor 1659 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495} 1660}
1496 1661
1497sub key_down { 1662sub key_down {
1498 my ($self, $ev) = @_; 1663 my ($self, $ev) = @_;
1499 1664
… …
1514 } elsif ($sym == CFClient::SDLK_HOME) { 1679 } elsif ($sym == CFClient::SDLK_HOME) {
1515 $self->{cursor} = 0; 1680 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) { 1681 } elsif ($sym == CFClient::SDLK_END) {
1517 $self->{cursor} = length $text; 1682 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1683 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1684 $self->_emit ('escape');
1520 } elsif ($uni) { 1685 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1687 }
1523 1688
1524 $self->_set_text ($text); 1689 $self->_set_text ($text);
1525 $self->update; 1690
1526 $self->check_size; 1691 $self->realloc;
1527} 1692}
1528 1693
1529sub focus_in { 1694sub focus_in {
1530 my ($self) = @_; 1695 my ($self) = @_;
1531 1696
… …
1611 if ($sym == 13) { 1776 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1777 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1778 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1779 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1780 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1781 $self->_emit (activate => $txt);
1617 $self->update; 1782 $self->update;
1618 1783
1619 } elsif ($sym == CFClient::SDLK_UP) { 1784 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1785 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1786 $self->{history_saveback} = $self->get_text;
… …
1658 1823
1659sub new { 1824sub new {
1660 my $class = shift; 1825 my $class = shift;
1661 1826
1662 $class->SUPER::new ( 1827 $class->SUPER::new (
1663 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1664 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1667 can_hover => 1, 1832 can_hover => 1,
1668 align => 0, 1833 align => 0,
1669 valign => 0, 1834 valign => 0,
1670 can_events => 1, 1835 can_events => 1,
1671 @_ 1836 @_
1672 ) 1837 )
1673} 1838}
1674 1839
1840sub activate { }
1841
1675sub button_up { 1842sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1677 1844
1845 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1846 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1847 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate");
1681 }
1682} 1848}
1683 1849
1684sub _draw { 1850sub _draw {
1685 my ($self) = @_; 1851 my ($self) = @_;
1686 1852
… …
1715 1881
1716sub new { 1882sub new {
1717 my $class = shift; 1883 my $class = shift;
1718 1884
1719 $class->SUPER::new ( 1885 $class->SUPER::new (
1720 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1721 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1889 active_fg => [1, 1, 0],
1890 bg => [0, 0, 0, 0.2],
1891 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1892 state => 0,
1724 can_hover => 1, 1893 can_hover => 1,
1725 @_ 1894 @_
1726 ) 1895 )
1727} 1896}
1728 1897
1729sub size_request { 1898sub size_request {
1730 my ($self) = @_; 1899 my ($self) = @_;
1731 1900
1732 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1733} 1902}
1734 1903
1735sub button_down { 1904sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1737 1906
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1742 } 1911 }
1743} 1912}
1744 1913
1745sub _draw { 1914sub _draw {
1746 my ($self) = @_; 1915 my ($self) = @_;
1747 1916
1748 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1749 1918
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 1920
1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1921 my ($w, $h) = @$self{qw(w h)};
1922
1923 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1753 1924
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 1926
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 1928
… …
2019 # TODO: req_w/h are wrong with vertical 2190 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2191 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2194 active_fg => [0, 0, 0],
2195 bg => [0, 0, 0, 0.2],
2196 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2197 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2198 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2199 min_h => $::WIDTH / 80,
2027 vertical => 0, 2200 vertical => 0,
2028 can_hover => 1, 2201 can_hover => 1,
2029 inner_pad => .05, 2202 inner_pad => 0.02,
2030 @_ 2203 @_
2031 ); 2204 );
2032 2205
2033 $self->set_value ($self->{range}[0]); 2206 $self->set_value ($self->{range}[0]);
2034 $self->update; 2207 $self->update;
2035 2208
2036 $self 2209 $self
2037} 2210}
2038 2211
2212sub changed { }
2213
2214sub set_range {
2215 my ($self, $range) = @_;
2216
2217 ($range, $self->{range}) = ($self->{range}, $range);
2218
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}";
2221}
2222
2039sub set_value { 2223sub set_value {
2040 my ($self, $value) = @_; 2224 my ($self, $value) = @_;
2041 2225
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2226 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043 2227
2044 $hi = $lo + 1 if $hi <= $lo; 2228 $hi = $lo + 1 if $hi <= $lo;
2045 2229
2230 $page = $hi - $lo if $page > $hi - $lo;
2231
2046 $value = $lo if $value < $lo; 2232 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi; 2233 $value = $hi - $page if $value > $hi - $page;
2048 2234
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2235 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit; 2236 if $unit;
2051 2237
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055 2239
2056 if ($value != $old_value) { 2240 if ($value != $old_value) {
2057 $self->emit (changed => $value); 2241 $self->_emit (changed => $value);
2058 $self->update; 2242 $self->update;
2059 } 2243 }
2060} 2244}
2061 2245
2062sub size_request { 2246sub size_request {
2063 my ($self) = @_; 2247 my ($self) = @_;
2064 2248
2065 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
2066 my $h = $self->{req_h};
2067
2068 $self->{vertical} ? ($h, $w) : ($w, $h)
2069} 2250}
2070 2251
2071sub button_down { 2252sub button_down {
2072 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
2073 2254
2074 $self->SUPER::button_down ($ev, $x, $y); 2255 $self->SUPER::button_down ($ev, $x, $y);
2256
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258
2075 $self->mouse_motion ($ev, $x, $y); 2259 $self->mouse_motion ($ev, $x, $y);
2076} 2260}
2077 2261
2078sub mouse_motion { 2262sub mouse_motion {
2079 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
… …
2081 if ($GRAB == $self) { 2265 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083 2267
2084 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2268 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085 2269
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2087 2271
2088 $self->set_value ($x * ($hi - $lo) + $lo); 2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2089 } 2273 }
2090} 2274}
2091 2275
2092sub update { 2276sub update {
2093 my ($self) = @_; 2277 my ($self) = @_;
2094 2278
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096 $self->set_value ($self->{range}[0]); 2280 $self->set_value ($self->{range}[0]);
2097 2281
2098 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2282 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100;
2099 2284
2100 my $inner_w = 1 - 2 * $self->{inner_pad}; 2285 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2101 2286
2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2287 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2288 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2103 2289
2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2290 $value = ($value - $lo) / $range;
2105 $value = $self->{scale} * ($value - $lo); 2291 $value = $value * $self->{scale} + $self->{offset};
2106 2292
2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value; 2293 $self->{knob_x} = $value - $knob_w * 0.5;
2113 $self->{knob_w} = $page; 2294 $self->{knob_w} = $knob_w;
2114 }); 2295 });
2115 2296
2116 $self->SUPER::update; 2297 $self->SUPER::update;
2117} 2298}
2118 2299
… …
2124 glScale $self->{w}, $self->{h}; 2305 glScale $self->{w}, $self->{h};
2125 2306
2126 if ($self->{vertical}) { 2307 if ($self->{vertical}) {
2127 # draw a vertical slider like a rotated horizontal slider 2308 # draw a vertical slider like a rotated horizontal slider
2128 2309
2310 glTranslate 1, 0, 0;
2129 glRotate 90, 0, 0, 1; 2311 glRotate 90, 0, 0, 1;
2130 glTranslate 0, 1, 0;
2131 } 2312 }
2132 2313
2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2314 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2315 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2135 2316
… …
2142 # draw handle 2323 # draw handle
2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2324 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2325
2145 glDisable GL_TEXTURE_2D; 2326 glDisable GL_TEXTURE_2D;
2146} 2327}
2328
2329#############################################################################
2330
2331package CFClient::UI::ValSlider;
2332
2333our @ISA = CFClient::UI::HBox::;
2334
2335sub new {
2336 my ($class, %arg) = @_;
2337
2338 my $range = delete $arg{range};
2339
2340 my $self = $class->SUPER::new (
2341 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2342 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2343 to_value => sub { shift },
2344 from_value => sub { shift },
2345 %arg,
2346 );
2347
2348 $self->{slider}->connect (changed => sub {
2349 my ($self, $value) = @_;
2350 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2351 $self->{parent}->emit (changed => $value);
2352 });
2353
2354# $self->{entry}->connect (changed => sub {
2355# my ($self, $value) = @_;
2356# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2357# $self->{parent}->emit (changed => $value);
2358# });
2359
2360 $self->add ($self->{slider}, $self->{entry});
2361
2362 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2363
2364 $self
2365}
2366
2367sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) }
2147 2369
2148############################################################################# 2370#############################################################################
2149 2371
2150package CFClient::UI::TextView; 2372package CFClient::UI::TextView;
2151 2373
… …
2181 2403
2182 $self->{fontsize} = $fontsize; 2404 $self->{fontsize} = $fontsize;
2183 $self->reflow; 2405 $self->reflow;
2184} 2406}
2185 2407
2186sub text_height {
2187 my ($self, $text) = @_;
2188
2189 my $layout = $self->{layout};
2190
2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2192 $layout->set_width ($self->{children}[0]{w});
2193 $layout->set_markup ($text);
2194
2195 ($layout->size)[1]
2196}
2197
2198sub reflow {
2199 my ($self) = @_;
2200
2201 $self->{need_reflow}++;
2202 $self->update;
2203}
2204
2205sub size_allocate { 2408sub size_allocate {
2206 my ($self, $w, $h) = @_; 2409 my ($self, $w, $h) = @_;
2207 2410
2208 $self->SUPER::size_allocate ($w, $h); 2411 $self->SUPER::size_allocate ($w, $h);
2209 2412
… …
2212 $self->{layout}->set_width ($self->{children}[0]{w}); 2415 $self->{layout}->set_width ($self->{children}[0]{w});
2213 2416
2214 $self->reflow; 2417 $self->reflow;
2215} 2418}
2216 2419
2420sub text_size {
2421 my ($self, $text, $indent) = @_;
2422
2423 my $layout = $self->{layout};
2424
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent);
2427 $layout->set_markup ($text);
2428
2429 $layout->size
2430}
2431
2432sub reflow {
2433 my ($self) = @_;
2434
2435 $self->{need_reflow}++;
2436 $self->update;
2437}
2438
2439sub set_offset {
2440 my ($self, $offset) = @_;
2441
2442 # todo: base offset on lines or so, not on pixels
2443 $self->{children}[1]->set_value ($offset);
2444}
2445
2446sub clear {
2447 my ($self) = @_;
2448
2449 $self->{par} = [];
2450 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452}
2453
2217sub add_paragraph { 2454sub add_paragraph {
2218 my ($self, $color, $text) = @_; 2455 my ($self, $color, $text, $indent) = @_;
2219 2456
2220 #TODO: intelligently "reformat" paragraph 2457 for my $line (split /\n/, $text) {
2221 2458 my ($w, $h) = $self->text_size ($line);
2222 my $height = $self->text_height ($text);
2223
2224 $self->{height} += $height; 2459 $self->{height} += $h;
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2461 }
2225 2462
2226 push @{$self->{par}}, [$height, $color, $text];
2227
2228 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2229 $self->{children}[1]->update;
2230} 2464}
2231 2465
2232sub update { 2466sub update {
2233 my ($self) = @_; 2467 my ($self) = @_;
2234 2468
… …
2237 return unless $self->{h} > 0; 2471 return unless $self->{h} > 0;
2238 2472
2239 delete $self->{texture}; 2473 delete $self->{texture};
2240 2474
2241 $ROOT->on_post_alloc ($self, sub { 2475 $ROOT->on_post_alloc ($self, sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477
2242 if (delete $self->{need_reflow}) { 2478 if (delete $self->{need_reflow}) {
2243 my $height = 0; 2479 my $height = 0;
2244 2480
2245 $height += $_->[0] = $self->text_height ($_->[2]) 2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2246 for @{$self->{par}}; 2485 for (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2487 $layout->set_width ($W - $_->[3]);
2488 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3];
2491 $_->[1] = $h;
2492 }
2493
2494 $height += $_->[1];
2495 }
2247 2496
2248 $self->{height} = $height; 2497 $self->{height} = $height;
2249 2498
2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2251 2500
2252 delete $self->{texture}; 2501 delete $self->{texture};
2253 } 2502 }
2254 2503
2255 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2256 glClearColor 0, 0, 0, 0; 2505 glClearColor 0.5, 0.5, 0.5, 0;
2257 glClear GL_COLOR_BUFFER_BIT; 2506 glClear GL_COLOR_BUFFER_BIT;
2258 2507
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0]; 2508 my $top = int $self->{children}[1]{range}[0];
2263 2509
2264 my $y0 = $top; 2510 my $y0 = $top;
2265 my $y1 = $top + $self->{h}; 2511 my $y1 = $top + $H;
2266 2512
2267 my $y = 0; 2513 my $y = 0;
2268 2514
2269 my $layout = $self->{layout}; 2515 my $layout = $self->{layout};
2270 2516
2271 $layout->set_font ($self->{font}) if $self->{font}; 2517 $layout->set_font ($self->{font}) if $self->{font};
2272 2518
2519 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off
2521 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2522
2273 for my $par (@{$self->{par}}) { 2523 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2524 my $h = $par->[1];
2275 2525
2276 if ($y0 < $y + $h && $y < $y1) { 2526 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] }); 2527 $layout->set_foreground (@{ $par->[2] });
2528 $layout->set_width ($W - $par->[3]);
2278 $layout->set_markup ($par->[2]); 2529 $layout->set_markup ($par->[4]);
2279 2530
2280 my ($W, $H) = $layout->size; 2531 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2532
2533 glRasterPos $par->[3], $y - $y0;
2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2535 }
2283 2536
2284 $y += $h; 2537 $y += $h;
2285 } 2538 }
2286 2539
2287 glDisable GL_TEXTURE_2D; 2540 glDisable GL_BLEND;
2288 }; 2541 };
2289 }); 2542 });
2290} 2543}
2291 2544
2292sub _draw { 2545sub _draw {
2293 my ($self) = @_; 2546 my ($self) = @_;
2294 2547
2295 glEnable GL_TEXTURE_2D; 2548 glEnable GL_TEXTURE_2D;
2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297 glColor 1, 1, 1, 1; 2550 glColor 1, 1, 1, 1;
2298 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2299 glDisable GL_TEXTURE_2D; 2552 glDisable GL_TEXTURE_2D;
2300 2553
2301 $self->{children}[1]->draw; 2554 $self->{children}[1]->draw;
2302 2555
2303} 2556}
… …
2352 2605
2353sub new { 2606sub new {
2354 my $class = shift; 2607 my $class = shift;
2355 2608
2356 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2357 state => 0, 2610 state => 0,
2358 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2359 @_ 2612 @_
2360 ); 2613 );
2361 2614
2362 if ($self->{state}) {
2363 $self->{state} = 0;
2364 $self->toggle_flopper;
2365 }
2366
2367 $self 2615 $self
2368} 2616}
2369 2617
2370sub toggle_flopper { 2618sub toggle_flopper {
2371 my ($self) = @_; 2619 my ($self) = @_;
2372 2620
2373 # TODO: use animation 2621 $self->{other}->toggle_visibility;
2374 if ($self->{state} = !$self->{state}) {
2375 $CFClient::UI::ROOT->add ($self->{other});
2376 $self->{other}->move ($self->coord2global (0, $self->{h}));
2377 $self->emit ("open");
2378 } else {
2379 $CFClient::UI::ROOT->remove ($self->{other});
2380 $self->emit ("close");
2381 }
2382
2383 $self->emit (changed => $self->{state});
2384} 2622}
2385 2623
2386############################################################################# 2624#############################################################################
2387 2625
2388package CFClient::UI::Tooltip; 2626package CFClient::UI::Tooltip;
… …
2401} 2639}
2402 2640
2403sub set_tooltip_from { 2641sub set_tooltip_from {
2404 my ($self, $widget) = @_; 2642 my ($self, $widget) = @_;
2405 2643
2644 my $tooltip = $widget->{tooltip};
2645
2646 if ($ENV{CFPLUS_DEBUG} & 2) {
2647 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}";
2651 }
2652
2406 $self->add (new CFClient::UI::Label 2653 $self->add (new CFClient::UI::Label
2407 markup => $widget->{tooltip}, 2654 markup => $tooltip,
2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8, 2656 fontsize => 0.8,
2410 fg => [0, 0, 0, 1], 2657 fg => [0, 0, 0, 1],
2658 ellipsise => 0,
2411 font => ($widget->{tooltip_font} || $::FONT_PROP), 2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 ); 2660 );
2413} 2661}
2414 2662
2415sub size_request { 2663sub size_request {
2416 my ($self) = @_; 2664 my ($self) = @_;
… …
2422 2670
2423sub size_allocate { 2671sub size_allocate {
2424 my ($self, $w, $h) = @_; 2672 my ($self, $w, $h) = @_;
2425 2673
2426 $self->SUPER::size_allocate ($w - 4, $h - 4); 2674 $self->SUPER::size_allocate ($w - 4, $h - 4);
2675}
2676
2677sub visibility_change {
2678 my ($self, $visible) = @_;
2679
2680 return unless $visible;
2681
2682 $self->{root}->on_post_alloc ("move_$self" => sub {
2683 my $widget = $self->{owner}
2684 or return;
2685
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH;
2690
2691 $self->move_abs ($x, $y);
2692 });
2427} 2693}
2428 2694
2429sub _draw { 2695sub _draw {
2430 my ($self) = @_; 2696 my ($self) = @_;
2431 2697
… …
2448 glVertex $w, $h; 2714 glVertex $w, $h;
2449 glVertex $w, 0; 2715 glVertex $w, 0;
2450 glEnd; 2716 glEnd;
2451 2717
2452 glTranslate 2 - 0.375, 2 - 0.375; 2718 glTranslate 2 - 0.375, 2 - 0.375;
2719
2453 $self->SUPER::_draw; 2720 $self->SUPER::_draw;
2454} 2721}
2455 2722
2456############################################################################# 2723#############################################################################
2457 2724
… …
2462use CFClient::OpenGL; 2729use CFClient::OpenGL;
2463 2730
2464sub new { 2731sub new {
2465 my $class = shift; 2732 my $class = shift;
2466 2733
2467 $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
2468 aspect => 1, 2735 aspect => 1,
2736 can_events => 0,
2469 @_, 2737 @_,
2470 ) 2738 );
2739
2740 if ($self->{anim} && $self->{animspeed}) {
2741 Scalar::Util::weaken (my $widget = $self);
2742
2743 $self->{timer} = Event->timer (
2744 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2745 hard => 1,
2746 interval => $self->{animspeed},
2747 cb => sub {
2748 ++$widget->{frame};
2749 $widget->update;
2750 },
2751 );
2752 }
2753
2754 $self
2471} 2755}
2472 2756
2473sub size_request { 2757sub size_request {
2474 (32, 8) 2758 (32, 8)
2475} 2759}
2476 2760
2761sub update {
2762 my ($self) = @_;
2763
2764 return unless $self->{visible};
2765
2766 $self->SUPER::update;
2767}
2768
2477sub _draw { 2769sub _draw {
2478 my ($self) = @_; 2770 my ($self) = @_;
2479 2771
2480 return unless $::CONN;#d# manage and cache textures differently 2772 return unless $::CONN;
2773
2774 my $face;
2775
2776 if ($self->{frame}) {
2777 my $anim = $::CONN->{anim}[$self->{anim}];
2778
2779 $face = $anim->[ $self->{frame} % @$anim ]
2780 if $anim && @$anim;
2781 }
2782
2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2482 2784
2483 # TODO animation
2484 if ($tex) { 2785 if ($tex) {
2485 glEnable GL_TEXTURE_2D; 2786 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2788 glColor 1, 1, 1, 1;
2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2490 } 2791 }
2491} 2792}
2492 2793
2493############################################################################# 2794sub DESTROY {
2494
2495package CFClient::UI::InventoryItem;
2496
2497our @ISA = CFClient::UI::HBox::;
2498
2499sub new {
2500 my $class = shift;
2501
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new (
2526 can_hover => 1,
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_,
2585 );
2586
2587 $self
2588}
2589
2590sub set_items {
2591 my ($self, $items) = @_; 2795 my ($self) = @_;
2592 2796
2593 $self->{scrolled}->clear; 2797 $self->{timer}->cancel
2594 return unless $items; 2798 if $self->{timer};
2595 2799
2596 my @items = sort { 2800 $self->SUPER::DESTROY;
2597 ($a->{type} <=> $b->{type})
2598 or ($a->{name} cmp $b->{name})
2599 } @$items;
2600
2601 $self->{real_items} = \@items;
2602
2603 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2609 }
2610
2611 $self->{scrolled}->add (@items);
2612
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614}
2615
2616sub size_request {
2617 my ($self) = @_;
2618 ($self->{req_w}, $self->{req_h});
2619} 2801}
2620 2802
2621############################################################################# 2803#############################################################################
2622 2804
2623package CFClient::UI::Menu; 2805package CFClient::UI::Menu;
… …
2658 2840
2659# popup given the event (must be a mouse button down event currently) 2841# popup given the event (must be a mouse button down event currently)
2660sub popup { 2842sub popup {
2661 my ($self, $ev) = @_; 2843 my ($self, $ev) = @_;
2662 2844
2663 $self->emit ("popdown"); 2845 $self->_emit ("popdown");
2664 2846
2665 # maybe save $GRAB? must be careful about events... 2847 # maybe save $GRAB? must be careful about events...
2666 $GRAB = $self; 2848 $GRAB = $self;
2667 $self->{button} = $ev->{button}; 2849 $self->{button} = $ev->{button};
2668 2850
2669 $self->show; 2851 $self->show;
2670 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2671} 2853}
2672 2854
2673sub mouse_motion { 2855sub mouse_motion {
2674 my ($self, $ev, $x, $y) = @_; 2856 my ($self, $ev, $x, $y) = @_;
2675 2857
… …
2683 2865
2684 if ($ev->{button} == $self->{button}) { 2866 if ($ev->{button} == $self->{button}) {
2685 undef $GRAB; 2867 undef $GRAB;
2686 $self->hide; 2868 $self->hide;
2687 2869
2688 $self->emit ("popdown"); 2870 $self->_emit ("popdown");
2689 $self->{hover}[1]->() if $self->{hover}; 2871 $self->{hover}[1]->() if $self->{hover};
2690 } 2872 }
2691} 2873}
2692 2874
2693############################################################################# 2875#############################################################################
2694 2876
2695package CFClient::UI::Statusbox; 2877package CFClient::UI::Statusbox;
2696 2878
2697our @ISA = CFClient::UI::VBox::; 2879our @ISA = CFClient::UI::VBox::;
2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2698 2889
2699sub reorder { 2890sub reorder {
2700 my ($self) = @_; 2891 my ($self) = @_;
2701 my $NOW = time; 2892 my $NOW = time;
2702 2893
… …
2722 : $item->{text}; 2913 : $item->{text};
2723 2914
2724 for ($short) { 2915 for ($short) {
2725 s/^\s+//; 2916 s/^\s+//;
2726 s/\s+/ /g; 2917 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 } 2918 }
2730 2919
2731 new CFClient::UI::Label 2920 new CFClient::UI::Label
2732 markup => $short, 2921 markup => $short,
2733 tooltip => $item->{tooltip}, 2922 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP, 2923 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67, 2924 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize}, 2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2737 fg => $item->{fg}, 2927 fg => $item->{fg},
2738 can_events => 1, 2928 can_events => 1,
2739 can_hover => 1 2929 can_hover => 1
2740 }; 2930 };
2741 } 2931 }
… …
2747sub add { 2937sub add {
2748 my ($self, $text, %arg) = @_; 2938 my ($self, $text, %arg) = @_;
2749 2939
2750 $text =~ s/^\s+//; 2940 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//; 2941 $text =~ s/\s+$//;
2942
2943 return unless $text;
2752 2944
2753 my $timeout = time + ((delete $arg{timeout}) || 60); 2945 my $timeout = time + ((delete $arg{timeout}) || 60);
2754 2946
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756 2948
… …
2768 $self->{item}{$group} = { 2960 $self->{item}{$group} = {
2769 id => ++$self->{id}, 2961 id => ++$self->{id},
2770 text => $text, 2962 text => $text,
2771 timeout => $timeout, 2963 timeout => $timeout,
2772 tooltip => $text, 2964 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8], 2965 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0, 2966 pri => 0,
2776 count => 1, 2967 count => 1,
2777 %arg, 2968 %arg,
2778 }; 2969 };
2779 } 2970 }
2780 2971
2781 $self->reorder; 2972 $self->reorder;
2782} 2973}
2783 2974
2975sub reconfigure {
2976 my ($self) = @_;
2977
2978 delete $_->{label}
2979 for values %{ $self->{item} || {} };
2980
2981 $self->reorder;
2982 $self->SUPER::reconfigure;
2983}
2984
2784############################################################################# 2985#############################################################################
2785 2986
2786package CFClient::UI::Root; 2987package CFClient::UI::Inventory;
2787 2988
2788our @ISA = CFClient::UI::Container::; 2989our @ISA = CFClient::UI::ScrolledWindow::;
2789
2790use CFClient::OpenGL;
2791 2990
2792sub new { 2991sub new {
2793 my $class = shift; 2992 my $class = shift;
2794 2993
2795 $class->SUPER::new ( 2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2796 @_, 2996 @_,
2797 ) 2997 );
2798}
2799 2998
2800sub configure { 2999 $self
3000}
3001
3002sub set_items {
3003 my ($self, $items) = @_;
3004
3005 $self->{scrolled}->clear;
3006 return unless $items;
3007
3008 my @items = sort {
3009 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name})
3011 } @$items;
3012
3013 $self->{real_items} = \@items;
3014
3015 my $row = 0;
3016 for my $item (@items) {
3017 CFClient::Item::update_widgets $item;
3018
3019 $self->{scrolled}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3022
3023 $row++;
3024 }
3025}
3026
3027#############################################################################
3028
3029package CFClient::UI::BindEditor;
3030
3031our @ISA = CFClient::UI::FancyFrame::;
3032
3033sub new {
3034 my $class = shift;
3035
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3037
3038 $self->add (my $vb = new CFClient::UI::VBox);
3039
3040
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3042 text => "start recording",
3043 tooltip => "Start/Stops recording of actions."
3044 ."All subsequent actions after the recording started will be captured."
3045 ."The actions are displayed after the record was stopped."
3046 ."To bind the action you have to click on the 'Bind' button",
3047 on_activate => sub {
3048 unless ($self->{recording}) {
3049 $self->start;
3050 } else {
3051 $self->stop;
3052 }
3053 });
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 });
3139}
3140
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
2801 my ($self, $x, $y, $w, $h) = @_; 3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2802 3148
2803 $self->{w} = $w; 3149 $self->clear_command_list;
2804 $self->{h} = $h; 3150 $self->{recording} = 0;
2805} 3151 $self->{rec_btn}->set_text ("start recording");
2806 3152
2807sub check_size { 3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
2808 my ($self) = @_; 3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
2809 3171
2810 $self->size_allocate ($self->{w}, $self->{h}) 3172sub update_binding_widgets {
2811 if $self->{w}; 3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell {
3238 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell;
3240
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268}
3269
3270sub remove_spell {
3271 my ($self, $spell) = @_;
3272 delete $self->{spells}->{$spell->{name}};
3273 $self->rebuild_spell_list;
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::Root;
3279
3280our @ISA = CFClient::UI::Container::;
3281
3282use CFClient::OpenGL;
3283
3284sub new {
3285 my $class = shift;
3286
3287 my $self = $class->SUPER::new (
3288 visible => 1,
3289 @_,
3290 );
3291
3292 Scalar::Util::weaken ($self->{root} = $self);
3293
3294 $self
2812} 3295}
2813 3296
2814sub size_request { 3297sub size_request {
2815 my ($self) = @_; 3298 my ($self) = @_;
2816 3299
2817 ($self->{w}, $self->{h}) 3300 ($self->{w}, $self->{h})
3301}
3302
3303sub _to_pixel {
3304 my ($coord, $size, $max) = @_;
3305
3306 $coord =
3307 $coord eq "center" ? ($max - $size) * 0.5
3308 : $coord eq "max" ? $max
3309 : $coord;
3310
3311 $coord = 0 if $coord < 0;
3312 $coord = $max - $size if $coord > $max - $size;
3313
3314 int $coord + 0.5
2818} 3315}
2819 3316
2820sub size_allocate { 3317sub size_allocate {
2821 my ($self, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
2822 3319
2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828
2829 for my $child ($self->children) { 3320 for my $child ($self->children) {
2830 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2831 3322
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3323 $X = $child->{force_x} if exists $child->{force_x};
2833 if exists $child->{req_x}; 3324 $Y = $child->{force_y} if exists $child->{force_y};
2834 3325
2835 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3326 $X = _to_pixel $X, $W, $self->{w};
2836 if exists $child->{req_y}; 3327 $Y = _to_pixel $Y, $H, $self->{h};
2837
2838 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2839 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2840 3328
2841 $child->configure ($X, $Y, $W, $H); 3329 $child->configure ($X, $Y, $W, $H);
2842 } 3330 }
2843} 3331}
2844 3332
… …
2855} 3343}
2856 3344
2857sub update { 3345sub update {
2858 my ($self) = @_; 3346 my ($self) = @_;
2859 3347
2860 $self->check_size;
2861 $::WANT_REFRESH++; 3348 $::WANT_REFRESH++;
2862} 3349}
2863 3350
2864sub add { 3351sub add {
2865 my ($self, @children) = @_; 3352 my ($self, @children) = @_;
2866 3353
2867 for my $child (@children) {
2868 $child->{toplevel} = 1; 3354 $_->{is_toplevel} = 1
2869 3355 for @children;
2870 # integerise window positions
2871 $child->{x} = int $child->{x};
2872 $child->{y} = int $child->{y};
2873 }
2874 3356
2875 $self->SUPER::add (@children); 3357 $self->SUPER::add (@children);
3358}
3359
3360sub remove {
3361 my ($self, @children) = @_;
3362
3363 $self->SUPER::remove (@children);
3364
3365 delete $self->{is_toplevel}
3366 for @children;
3367
3368 while (@children) {
3369 my $w = pop @children;
3370 push @children, $w->children;
3371 $w->set_invisible;
3372 }
2876} 3373}
2877 3374
2878sub on_refresh { 3375sub on_refresh {
2879 my ($self, $id, $cb) = @_; 3376 my ($self, $id, $cb) = @_;
2880 3377
… …
2893 while ($self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
2894 $_->() 3391 $_->()
2895 for values %{delete $self->{refresh_hook}}; 3392 for values %{delete $self->{refresh_hook}};
2896 } 3393 }
2897 3394
2898 if ($self->{check_size}) { 3395 if ($self->{realloc}) {
2899 my @queue = ([], []); 3396 my %queue;
3397 my @queue;
3398 my $widget;
2900 3399
2901 for (;;) { 3400 outer:
2902 if ($self->{check_size}) { 3401 while () {
2903 # heuristic: check containers last 3402 if (my $realloc = delete $self->{realloc}) {
2904 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3403 for $widget (values %$realloc) {
2905 for values %{delete $self->{check_size}} 3404 $widget->{visible} or next; # do not resize invisible widgets
3405
3406 $queue{$widget+0}++ and next; # duplicates are common
3407
3408 push @{ $queue[$widget->{visible}] }, $widget;
3409 }
2906 } 3410 }
2907 3411
2908 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3412 while () {
3413 @queue or last outer;
2909 3414
2910 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3415 $widget = pop @{ $queue[-1] || [] }
2911 ? @$widget{qw(user_w user_h)} 3416 and last;
2912 : $widget->size_request;
2913
2914 if (delete $widget->{force_alloc}
2915 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2916 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2917 3417
3418 pop @queue;
3419 }
3420
3421 delete $queue{$widget+0};
3422
3423 my ($w, $h) = $widget->size_request;
3424
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3427
3428 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h};
3430
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3432 || delete $widget->{force_realloc}) {
2918 $widget->{req_w} = $w; 3433 $widget->{req_w} = $w;
2919 $widget->{req_h} = $h; 3434 $widget->{req_h} = $h;
2920 3435
2921 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3436 $self->{size_alloc}{$widget+0} = $widget;
2922 3437
2923 $widget->{parent}->check_size
2924 if $widget->{parent}; 3438 if (my $parent = $widget->{parent}) {
3439 $self->{realloc}{$parent+0} = $parent
3440 unless $queue{$parent+0};
3441
3442 $parent->{force_size_alloc} = 1;
3443 $self->{size_alloc}{$parent+0} = $parent;
3444 }
2925 } 3445 }
3446
3447 delete $self->{realloc}{$widget+0};
2926 } 3448 }
2927 } 3449 }
2928 3450
2929 while ($self->{size_alloc}) { 3451 while (my $size_alloc = delete $self->{size_alloc}) {
2930 for (values %{delete $self->{size_alloc}}) { 3452 my @queue = sort { $b->{visible} <=> $a->{visible} }
2931 my ($widget, $w, $h) = @$_; 3453 values %$size_alloc;
3454
3455 while () {
3456 my $widget = pop @queue || last;
3457
3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2932 3459
2933 $w = 0 if $w < 0; 3460 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0; 3461 $h = 0 if $h < 0;
2935 3462
3463 $w = int $w + 0.5;
3464 $h = int $h + 0.5;
3465
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3467 $widget->{old_w} = $widget->{w};
3468 $widget->{old_h} = $widget->{h};
3469
2936 $widget->{w} = $w; 3470 $widget->{w} = $w;
2937 $widget->{h} = $h; 3471 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h); 3472
2939 $widget->emit (size_allocate => $w, $h); 3473 $widget->emit (size_allocate => $w, $h);
3474 }
2940 } 3475 }
2941 } 3476 }
2942 3477
2943 while ($self->{post_alloc_hook}) { 3478 while ($self->{post_alloc_hook}) {
2944 $_->() 3479 $_->()
2945 for values %{delete $self->{post_alloc_hook}}; 3480 for values %{delete $self->{post_alloc_hook}};
2946 } 3481 }
2947 3482
3483
2948 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2950 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
2951 3487
2952 glMatrixMode GL_PROJECTION; 3488 glMatrixMode GL_PROJECTION;
2953 glLoadIdentity; 3489 glLoadIdentity;
2954 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2955 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
2956 glLoadIdentity; 3492 glLoadIdentity;
2957 3493
3494 {
3495 package CFClient::UI::Base;
3496
3497 ($draw_x, $draw_y, $draw_w, $draw_h) =
3498 (0, 0, $self->{w}, $self->{h});
3499 }
3500
2958 $self->_draw; 3501 $self->_draw;
2959} 3502}
2960 3503
2961############################################################################# 3504#############################################################################
2962 3505
2963package CFClient::UI; 3506package CFClient::UI;
2964 3507
2965$ROOT = new CFClient::UI::Root; 3508$ROOT = new CFClient::UI::Root;
2966$TOOLTIP = new CFClient::UI::Tooltip; 3509$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967 3510
29681 35111
2969 3512

Diff Legend

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