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.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 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 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
150 $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.]+$/;
151 $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};
152 $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};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $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.]+$/;
155 $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};
156 $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};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
158 } 189 }
159
160 $widget->reconfigure;
161 } 190 }
191
192 reconfigure_widgets;
162} 193}
163 194
164############################################################################# 195#############################################################################
165 196
166package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
171 202
172sub new { 203sub new {
173 my $class = shift; 204 my $class = shift;
174 205
175 my $self = bless { 206 my $self = bless {
176 x => 0, 207 x => "center",
177 y => 0, 208 y => "center",
178 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
179 can_events => 1, 212 can_events => 1,
180 @_ 213 @_
181 }, $class; 214 }, $class;
182 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
183 for (keys %$self) { 218 for (keys %$self) {
184 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
186 } 221 }
187 } 222 }
188 223
189 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 }
190 235
191 $self 236 $self
192} 237}
193 238
194sub destroy { 239sub destroy {
… …
204 return if $self->{parent}; 249 return if $self->{parent};
205 250
206 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
207} 252}
208 253
209sub hide { 254sub set_visible {
210 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};
211 278
212 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
216 if $self->{parent}; 313 if $self->{parent};
217} 314}
218 315
219sub move { 316sub move_abs {
220 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
221 318
222 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
225 322
226 $self->update; 323 $self->update;
227} 324}
228 325
229sub set_size { 326sub set_size {
230 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
231 328
232 $self->{user_w} = $w; 329 $self->{force_w} = $w;
233 $self->{user_h} = $h; 330 $self->{force_h} = $h;
234 331
235 $self->check_size; 332 $self->realloc;
236} 333}
237 334
238sub size_request { 335sub size_request {
239 require Carp; 336 require Carp;
240 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
242 339
243sub configure { 340sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
245 342
246 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
249 348
250 # use alignment to adjust x, y 349 # use alignment to adjust x, y
251 350
252 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 353 }
257 354
258 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 356 $self->{x} = $x;
260 $self->{y} = $y; 357 $self->{y} = $y;
261 $self->update; 358 $self->update;
262 } 359 }
263 360
264 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $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;
266 } 368 }
267} 369}
268 370
269sub size_allocate { 371sub size_allocate {
270 # nothing to be done 372 # nothing to be done
271} 373}
272 374
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 375sub children {
281} 376}
282 377
283sub set_max_size { 378sub set_max_size {
284 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 383}
289 384
290sub set_tooltip { 385sub set_tooltip {
291 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
292 392
293 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
294 394
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 418 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
320 420
321 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
322 422
323 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
324 424
325 $focus->update if $focus; 425 $focus->update if $focus;
326 $FOCUS->update; 426 $FOCUS->update;
327} 427}
328 428
… …
331 431
332 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
333 433
334 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
335 435
336 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
337 437
338 $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;
339} 442}
340 443
341sub mouse_motion { } 444sub mouse_motion { }
342sub button_up { } 445sub button_up { }
343sub key_down { } 446sub key_down { }
344sub key_up { } 447sub key_up { }
345 448
346sub button_down { 449sub button_down {
347 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
348 451
349 $self->focus_in; 452 $self->focus_in;
350} 453}
351 454
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
356sub 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
357 528
358sub draw { 529sub draw {
359 my ($self) = @_; 530 my ($self) = @_;
360 531
361 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539
540 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
362 543
363 glPushMatrix; 544 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw; 546 $self->_draw;
366 glPopMatrix; 547 glPopMatrix;
… …
378 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
379 glEnd; 560 glEnd;
380 glDisable GL_BLEND; 561 glDisable GL_BLEND;
381 } 562 }
382 563
383 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
384 glPushMatrix; 565 glPushMatrix;
385 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 569 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
392 glEnd; 573 glEnd;
393 glPopMatrix; 574 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 } 576 }
396} 577}
397 578
398sub _draw { 579sub _draw {
399 my ($self) = @_; 580 my ($self) = @_;
400 581
401 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
402}
403
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450} 583}
451 584
452sub DESTROY { 585sub DESTROY {
453 my ($self) = @_; 586 my ($self) = @_;
454 587
… …
512 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
514} 647}
515 648
516sub size_request { 649sub size_request {
517 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
518} 653}
519 654
520sub draw { } 655sub draw { }
521 656
522############################################################################# 657#############################################################################
… …
551 $self->{children} = [ 686 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 688 @{$self->{children}}, @widgets
554 ]; 689 ];
555 690
556 $self->check_size (1); 691 $self->realloc;
557 $self->update;
558} 692}
559 693
560sub children { 694sub children {
561 @{ $_[0]{children} } 695 @{ $_[0]{children} }
562} 696}
… …
567 delete $child->{parent}; 701 delete $child->{parent};
568 $child->hide; 702 $child->hide;
569 703
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 705
572 $self->check_size; 706 $self->realloc;
573 $self->update;
574} 707}
575 708
576sub clear { 709sub clear {
577 my ($self) = @_; 710 my ($self) = @_;
578 711
… …
582 for (@$children) { 715 for (@$children) {
583 delete $_->{parent}; 716 delete $_->{parent};
584 $_->hide; 717 $_->hide;
585 } 718 }
586 719
587 $self->check_size; 720 $self->realloc;
588 $self->update;
589} 721}
590 722
591sub find_widget { 723sub find_widget {
592 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
593 725
… …
680 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 813 $self->update;
682} 814}
683 815
684sub _render { 816sub _render {
817 my ($self) = @_;
818
685 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
686} 820}
687 821
688sub render_child { 822sub render_child {
689 my ($self) = @_; 823 my ($self) = @_;
690 824
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
694 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
695 $self->_render; 836 $self->_render;
696# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 }; 837 };
704} 838}
705 839
706sub _draw { 840sub _draw {
707 my ($self) = @_; 841 my ($self) = @_;
708 842
709 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
710 844
711 my $tex = $self->{texture} 845 my $tex = $self->{texture}
712 or return; 846 or return;
713 847
714 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1; 850 glColor 1, 1, 1, 1;
717 851
718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719 853
720 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
721} 855}
… …
724 858
725package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
726 860
727our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
728 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
729sub size_request { 873sub size_request {
730 my ($self) = @_; 874 my ($self) = @_;
731 875
732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 877
735 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
736} 882}
737 883
738sub size_allocate { 884sub size_allocate {
739 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
740 886
887 my $child = $self->child;
888
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891
892 $self->child->configure (0, 0, $w, $h);
741 $self->update; 893 $self->update;
742} 894}
743 895
744sub set_offset { 896sub set_offset {
745 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
… …
779} 931}
780 932
781sub _render { 933sub _render {
782 my ($self) = @_; 934 my ($self) = @_;
783 935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
938
784 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
785 940
786 $self->SUPER::_render; 941 $self->SUPER::_render;
787} 942}
788 943
… …
796 my $class = shift; 951 my $class = shift;
797 952
798 my $self; 953 my $self;
799 954
800 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
801 vertical => 1, 956 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 958 on_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
805 }, 960 },
806 ; 961 ;
807 962
808 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 964 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 965 slider => $slider,
811 @_, 966 @_,
812 ); 967 );
813 968
814 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp}); 970 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
817 972
818 $self 973 $self
974}
975
976sub update {
977 my ($self) = @_;
978
979 $self->SUPER::update;
980
981 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984}
985
986sub size_allocate {
987 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
819} 993}
820 994
821#TODO# update range on size_allocate depending on child 995#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 996# update viewport offset on scroll
823 997
… …
867 1041
868our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
869 1043
870use CFClient::OpenGL; 1044use CFClient::OpenGL;
871 1045
872my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
874 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
875 1053
876sub new { 1054sub new {
877 my $class = shift; 1055 my ($class, %arg) = @_;
878 1056
879 # TODO: user_x, user_y, overwrite moveto? 1057 my $title = delete $arg{title};
880 1058
881 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
884 border => 0.6, 1062 border => 0.6,
885 toplevel => 1,
886 can_events => 1, 1063 can_events => 1,
887 @_ 1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
888 ); 1067 );
889 1068
890 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
891 align => 0, 1070 align => 0,
892 valign => 1, 1071 valign => 1,
893 text => $self->{title}, 1072 text => $title,
894 fontsize => $self->{border}; 1073 fontsize => $self->{border}
1074 if defined $title;
895 1075
896 $self 1076 $self
1077}
1078
1079sub add {
1080 my ($self, @widgets) = @_;
1081
1082 $self->SUPER::add (@widgets);
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
897} 1084}
898 1085
899sub border { 1086sub border {
900 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
901} 1088}
902 1089
903sub size_request { 1090sub size_request {
904 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
905 1095
906 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
907 1097
908 ( 1098 (
909 $w + $self->border * 2, 1099 $w + $self->border * 2,
… …
912} 1102}
913 1103
914sub size_allocate { 1104sub size_allocate {
915 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
916 1106
1107 if ($self->{title}) {
1108 $self->{title}{w} = $w;
1109 $self->{title}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h);
1111 }
1112
1113 my $border = $self->border;
1114
917 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
918 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
919 1117
920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
921 if $self->{title};
922
923 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
924} 1119}
925 1120
926sub button_down { 1121sub button_down {
927 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
928 1123
… …
944 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
945 1140
946 my $dx = $ev->{x} - $ox; 1141 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy; 1142 my $dy = $ev->{y} - $oy;
948 1143
949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146
1147 $self->realloc;
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
952 $self->check_size;
953 }; 1149 };
954 1150
955 } elsif ($lr ^ $td) { 1151 } elsif ($lr ^ $td) {
956 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
957 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
… …
959 $self->{motion} = sub { 1155 $self->{motion} = sub {
960 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
961 1157
962 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
963 1159
964 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
965 $self->update;
966 }; 1161 };
967 } 1162 }
968} 1163}
969 1164
970sub button_up { 1165sub button_up {
… …
980} 1175}
981 1176
982sub _draw { 1177sub _draw {
983 my ($self) = @_; 1178 my ($self) = @_;
984 1179
1180 my $child = $self->{children}[0];
1181
985 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
987 1184
988 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990 1187
991 my $border = $self->border; 1188 my $border = $self->border;
992 1189
993 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
994 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
998 1195
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1000 my $bg = $tex[0]; 1197 glColor @{ $self->{bg} };
1001 1198
1002 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
1200 # solve this better(?)
1003 my $rep_x = $cw / $bg->{w}; 1201 $bg->{s} = $cw / $bg->{w};
1004 my $rep_y = $ch / $bg->{h}; 1202 $bg->{t} = $ch / $bg->{h};
1005
1006 glColor @{ $self->{bg} };
1007
1008 $bg->{s} = $rep_x;
1009 $bg->{t} = $rep_y;
1010 $bg->{wrap_mode} = 1;
1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 } 1204 }
1013 1205
1014 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
1015 1207
1016 $self->{title}->draw if $self->{title};
1017
1018 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
1019} 1214}
1020 1215
1021############################################################################# 1216#############################################################################
1022 1217
1023package CFClient::UI::Table; 1218package CFClient::UI::Table;
… …
1031sub new { 1226sub new {
1032 my $class = shift; 1227 my $class = shift;
1033 1228
1034 $class->SUPER::new ( 1229 $class->SUPER::new (
1035 col_expand => [], 1230 col_expand => [],
1036 @_ 1231 @_,
1037 ) 1232 )
1233}
1234
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038} 1237}
1039 1238
1040sub add { 1239sub add {
1041 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
1042 1241
1043 $child->set_parent ($self); 1242 $child->set_parent ($self);
1044 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
1045 1244
1046 $child->check_size; 1245 $self->realloc;
1047} 1246}
1048 1247
1049sub children {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051}
1052
1053# TODO: move to container class maybe? send childs a signal on removal? 1248# TODO: move to container class maybe? send children a signal on removal?
1054sub clear { 1249sub clear {
1055 my ($self) = @_; 1250 my ($self) = @_;
1056 1251
1057 my @children = $self->children; 1252 my @children = $self->children;
1058 delete $self->{children}; 1253 delete $self->{children};
… …
1060 for (@children) { 1255 for (@children) {
1061 delete $_->{parent}; 1256 delete $_->{parent};
1062 $_->hide; 1257 $_->hide;
1063 } 1258 }
1064 1259
1065 $self->update; 1260 $self->realloc;
1066} 1261}
1067 1262
1068sub get_wh { 1263sub get_wh {
1069 my ($self) = @_; 1264 my ($self) = @_;
1070 1265
… …
1101sub size_allocate { 1296sub size_allocate {
1102 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
1103 1298
1104 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
1105 1300
1106 my $req_w = sum @$ws; 1301 my $req_w = (sum @$ws) || 1;
1107 my $req_h = sum @$hs; 1302 my $req_h = (sum @$hs) || 1;
1108 1303
1109 # TODO: nicer code && do row_expand 1304 # TODO: nicer code && do row_expand
1110 my @col_expand = @{$self->{col_expand}}; 1305 my @col_expand = @{$self->{col_expand}};
1111 @col_expand = (1) x @$ws unless @col_expand; 1306 @col_expand = (1) x @$ws unless @col_expand;
1112 my $col_expand = (sum @col_expand) || 1; 1307 my $col_expand = (sum @col_expand) || 1;
… …
1166 } 1361 }
1167} 1362}
1168 1363
1169############################################################################# 1364#############################################################################
1170 1365
1171package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1172
1173# TODO: wrap into common Box base class
1174 1367
1175our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1176 1369
1177sub size_request { 1370sub size_request {
1178 my ($self) = @_; 1371 my ($self) = @_;
1179 1372
1180 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1181 1374 ? (
1182 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1183 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1184 (List::Util::max map $_->[1], @alloc), 1377 )
1185 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1186} 1382}
1187 1383
1188sub size_allocate { 1384sub size_allocate {
1189 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1190 1386
1191 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1192
1193 my $children = $self->{children}; 1388 my $children = $self->{children};
1194 1389
1195 my @h = map $_->{req_w}, @$children; 1390 my @req;
1196 1391
1197 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1198 1393 @req = ($space / (@$children || 1)) x @$children;
1199 if ($req_h > $h) {
1200 # ah well, not enough space
1201 $_ *= $h / $req_h for @h;
1202 } else { 1394 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1396 my $req = List::Util::sum @req;
1397
1398 if ($req > $space) {
1399 # ah well, not enough space
1400 $_ *= $space / $req for @req;
1401 } else {
1203 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1204 $exp ||= 1;
1205 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1206 for (0 .. $#$children) { 1407 for 0 .. $#$children;
1207 my $child = $children->[$_];
1208
1209 my $alloc_h = $h[$_];
1210 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1211 $h[$_] = $alloc_h;
1212 } 1408 }
1213 } 1409 }
1214 1410
1215 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1216 1412
1217 my $y = 0; 1413 my $pos = 0;
1218 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1219 my $child = $children->[$_];
1220 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1221 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1222 1417
1223 $y += $h; 1418 $pos += $alloc;
1224 } 1419 }
1225 1420
1226 1 1421 1
1227} 1422}
1228 1423
1229############################################################################# 1424#############################################################################
1230 1425
1426package CFClient::UI::HBox;
1427
1428our @ISA = CFClient::UI::Box::;
1429
1430sub new {
1431 my $class = shift;
1432
1433 $class->SUPER::new (
1434 vertical => 0,
1435 @_,
1436 )
1437}
1438
1439#############################################################################
1440
1231package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1232 1442
1233# TODO: wrap into common Box base class
1234
1235our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1236 1444
1237sub size_request { 1445sub new {
1238 my ($self) = @_; 1446 my $class = shift;
1239 1447
1240 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1241 1449 vertical => 1,
1242 ( 1450 @_,
1243 (List::Util::max map $_->[0], @alloc),
1244 (List::Util::sum map $_->[1], @alloc),
1245 ) 1451 )
1246}
1247
1248sub size_allocate {
1249 my ($self, $w, $h) = @_;
1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1253 my $children = $self->{children};
1254
1255 my @h = map $_->{req_h}, @$children;
1256
1257 my $req_h = List::Util::sum @h;
1258
1259 if ($req_h > $h) {
1260 # ah well, not enough space
1261 $_ *= $h / $req_h for @h;
1262 } else {
1263 my $exp = List::Util::sum map $_->{expand}, @$children;
1264 $exp ||= 1;
1265
1266 for (0 .. $#$children) {
1267 my $child = $children->[$_];
1268
1269 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1270 }
1271 }
1272
1273 CFClient::UI::harmonize \@h;
1274
1275 my $y = 0;
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278 my $h = $h[$_];
1279 $child->configure (0, $y, $w, $h);
1280
1281 $y += $h;
1282 }
1283
1284 1
1285} 1452}
1286 1453
1287############################################################################# 1454#############################################################################
1288 1455
1289package CFClient::UI::Label; 1456package CFClient::UI::Label;
… …
1306 ellipsise => 3, # end 1473 ellipsise => 3, # end
1307 layout => (new CFClient::Layout), 1474 layout => (new CFClient::Layout),
1308 fontsize => 1, 1475 fontsize => 1,
1309 align => -1, 1476 align => -1,
1310 valign => -1, 1477 valign => -1,
1311 padding => 2, 1478 padding_x => 2,
1479 padding_y => 2,
1312 can_events => 0, 1480 can_events => 0,
1313 %arg 1481 %arg
1314 ); 1482 );
1315 1483
1316 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
… …
1352 $self->{text} = "T$text"; 1520 $self->{text} = "T$text";
1353 1521
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1356 1524
1525 $self->realloc;
1357 $self->update; 1526 $self->update;
1358 $self->check_size;
1359} 1527}
1360 1528
1361sub set_markup { 1529sub set_markup {
1362 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1363 1531
… …
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1535 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368 1536
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1370 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1371 1539
1540 $self->realloc;
1372 $self->update; 1541 $self->update;
1373 $self->check_size;
1374} 1542}
1375 1543
1376sub size_request { 1544sub size_request {
1377 my ($self) = @_; 1545 my ($self) = @_;
1378 1546
… …
1392 1560
1393 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1394 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1395 } 1563 }
1396 1564
1397 ( 1565 ($w, $h)
1398 $w + $self->{padding} * 2,
1399 $h + $self->{padding} * 2,
1400 )
1401} 1566}
1402 1567
1403sub size_allocate { 1568sub size_allocate {
1404 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1405 1570
1571 delete $self->{ox};
1572
1406 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1407} 1575}
1408 1576
1409sub set_fontsize { 1577sub set_fontsize {
1410 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1411 1579
1412 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1413 delete $self->{texture}; 1581 delete $self->{texture};
1414 1582
1415 $self->update; 1583 $self->realloc;
1416 $self->check_size;
1417} 1584}
1418 1585
1419sub _draw { 1586sub _draw {
1420 my ($self) = @_; 1587 my ($self) = @_;
1421 1588
… …
1427 $self->{layout}->set_width ($self->{w}); 1594 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1595 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1598
1432 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1599 new_from_layout CFClient::Texture $self->{layout}
1600 };
1433 1601
1602 unless (exists $self->{ox}) {
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1436 : ($self->{w} - $tex->{w}) * 0.5); 1605 : ($self->{w} - $tex->{w}) * 0.5);
1437 1606
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1440 : ($self->{h} - $tex->{h}) * 0.5); 1609 : ($self->{h} - $tex->{h}) * 0.5);
1441
1442 $tex
1443 }; 1610 };
1444 1611
1445 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1447 1614
… …
1473 active_fg => [0, 0, 0], 1640 active_fg => [0, 0, 0],
1474 can_hover => 1, 1641 can_hover => 1,
1475 can_focus => 1, 1642 can_focus => 1,
1476 valign => 0, 1643 valign => 0,
1477 can_events => 1, 1644 can_events => 1,
1645 #text => ...
1478 @_ 1646 @_
1479 ) 1647 )
1480} 1648}
1481 1649
1482sub _set_text { 1650sub _set_text {
… …
1492 $self->{text} = $text; 1660 $self->{text} = $text;
1493 1661
1494 $text =~ s/./*/g if $self->{hidden}; 1662 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1663 $self->{layout}->set_text ("$text ");
1496 1664
1497 $self->emit (changed => $self->{text}); 1665 $self->_emit (changed => $self->{text});
1498} 1666}
1499 1667
1500sub set_text { 1668sub set_text {
1501 my ($self, $text) = @_; 1669 my ($self, $text) = @_;
1502 1670
1503 $self->{cursor} = length $text; 1671 $self->{cursor} = length $text;
1504 $self->_set_text ($text); 1672 $self->_set_text ($text);
1505 $self->update; 1673
1506 $self->check_size; 1674 $self->realloc;
1507} 1675}
1508 1676
1509sub get_text { 1677sub get_text {
1510 $_[0]{text} 1678 $_[0]{text}
1511} 1679}
… …
1514 my ($self) = @_; 1682 my ($self) = @_;
1515 1683
1516 my ($w, $h) = $self->SUPER::size_request; 1684 my ($w, $h) = $self->SUPER::size_request;
1517 1685
1518 ($w + 1, $h) # add 1 for cursor 1686 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525} 1687}
1526 1688
1527sub key_down { 1689sub key_down {
1528 my ($self, $ev) = @_; 1690 my ($self, $ev) = @_;
1529 1691
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1706 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1707 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1708 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1709 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1710 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1711 $self->_emit ('escape');
1550 } elsif ($uni) { 1712 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1552 } 1714 }
1553 1715
1554 $self->_set_text ($text); 1716 $self->_set_text ($text);
1555 $self->update; 1717
1556 $self->check_size; 1718 $self->realloc;
1557} 1719}
1558 1720
1559sub focus_in { 1721sub focus_in {
1560 my ($self) = @_; 1722 my ($self) = @_;
1561 1723
… …
1641 if ($sym == 13) { 1803 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1804 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1805 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1806 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1807 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1808 $self->_emit (activate => $txt);
1647 $self->update; 1809 $self->update;
1648 1810
1649 } elsif ($sym == CFClient::SDLK_UP) { 1811 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1812 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1813 $self->{history_saveback} = $self->get_text;
… …
1688 1850
1689sub new { 1851sub new {
1690 my $class = shift; 1852 my $class = shift;
1691 1853
1692 $class->SUPER::new ( 1854 $class->SUPER::new (
1693 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1694 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1695 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1696 can_hover => 1, 1859 can_hover => 1,
1697 align => 0, 1860 align => 0,
1698 valign => 0, 1861 valign => 0,
1699 can_events => 1, 1862 can_events => 1,
1700 @_ 1863 @_
1701 ) 1864 )
1702} 1865}
1703 1866
1867sub activate { }
1868
1704sub button_up { 1869sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1706 1871
1872 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1873 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1874 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate");
1710 }
1711} 1875}
1712 1876
1713sub _draw { 1877sub _draw {
1714 my ($self) = @_; 1878 my ($self) = @_;
1715 1879
… …
1744 1908
1745sub new { 1909sub new {
1746 my $class = shift; 1910 my $class = shift;
1747 1911
1748 $class->SUPER::new ( 1912 $class->SUPER::new (
1749 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1750 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1751 active_fg => [1, 1, 0], 1916 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2], 1917 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5], 1918 active_bg => [1, 1, 1, 0.5],
1754 state => 0, 1919 state => 0,
… …
1758} 1923}
1759 1924
1760sub size_request { 1925sub size_request {
1761 my ($self) = @_; 1926 my ($self) = @_;
1762 1927
1763 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1764} 1929}
1765 1930
1766sub button_down { 1931sub button_down {
1767 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1768 1933
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1771 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1773 } 1938 }
1774} 1939}
1775 1940
1776sub _draw { 1941sub _draw {
1777 my ($self) = @_; 1942 my ($self) = @_;
1778 1943
1779 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1780 1945
1781 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1782 1947
1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1948 my ($w, $h) = @$self{qw(w h)};
1949
1950 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1784 1951
1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1786 1953
1787 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788 1955
… …
2052 my $self = $class->SUPER::new ( 2219 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2221 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2222 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2223 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2224 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2225 min_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2226 min_h => $::WIDTH / 80,
2060 vertical => 0, 2227 vertical => 0,
2061 can_hover => 1, 2228 can_hover => 1,
2062 inner_pad => .05, 2229 inner_pad => 0.02,
2063 @_ 2230 @_
2064 ); 2231 );
2065 2232
2066 $self->set_value ($self->{range}[0]); 2233 $self->set_value ($self->{range}[0]);
2067 $self->update; 2234 $self->update;
2068 2235
2069 $self 2236 $self
2070} 2237}
2071 2238
2239sub changed { }
2240
2241sub set_range {
2242 my ($self, $range) = @_;
2243
2244 ($range, $self->{range}) = ($self->{range}, $range);
2245
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}";
2248}
2249
2072sub set_value { 2250sub set_value {
2073 my ($self, $value) = @_; 2251 my ($self, $value) = @_;
2074 2252
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2253 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2254
2077 $hi = $lo + 1 if $hi <= $lo; 2255 $hi = $lo + 1 if $hi <= $lo;
2078 2256
2257 $page = $hi - $lo if $page > $hi - $lo;
2258
2079 $value = $lo if $value < $lo; 2259 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2260 $value = $hi - $page if $value > $hi - $page;
2081 2261
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2262 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2263 if $unit;
2084 2264
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2266
2089 if ($value != $old_value) { 2267 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2268 $self->_emit (changed => $value);
2091 $self->update; 2269 $self->update;
2092 } 2270 }
2093} 2271}
2094 2272
2095sub size_request { 2273sub size_request {
2096 my ($self) = @_; 2274 my ($self) = @_;
2097 2275
2098 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
2099 my $h = $self->{req_h};
2100
2101 $self->{vertical} ? ($h, $w) : ($w, $h)
2102} 2277}
2103 2278
2104sub button_down { 2279sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
2106 2281
2107 $self->SUPER::button_down ($ev, $x, $y); 2282 $self->SUPER::button_down ($ev, $x, $y);
2283
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285
2108 $self->mouse_motion ($ev, $x, $y); 2286 $self->mouse_motion ($ev, $x, $y);
2109} 2287}
2110 2288
2111sub mouse_motion { 2289sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2290 my ($self, $ev, $x, $y) = @_;
… …
2114 if ($GRAB == $self) { 2292 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2294
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2295 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2296
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2298
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122 } 2300 }
2123} 2301}
2124 2302
2125sub update { 2303sub update {
2126 my ($self) = @_; 2304 my ($self) = @_;
2127 2305
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]); 2307 $self->set_value ($self->{range}[0]);
2130 2308
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2309 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100;
2132 2311
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2312 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2313
2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2314 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2315 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136 2316
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2317 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2318 $value = $value * $self->{scale} + $self->{offset};
2139 2319
2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value; 2320 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2321 $self->{knob_w} = $knob_w;
2147 }); 2322 });
2148 2323
2149 $self->SUPER::update; 2324 $self->SUPER::update;
2150} 2325}
2151 2326
… …
2175 # draw handle 2350 # draw handle
2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2351 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177 2352
2178 glDisable GL_TEXTURE_2D; 2353 glDisable GL_TEXTURE_2D;
2179} 2354}
2355
2356#############################################################################
2357
2358package CFClient::UI::ValSlider;
2359
2360our @ISA = CFClient::UI::HBox::;
2361
2362sub new {
2363 my ($class, %arg) = @_;
2364
2365 my $range = delete $arg{range};
2366
2367 my $self = $class->SUPER::new (
2368 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2369 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2370 to_value => sub { shift },
2371 from_value => sub { shift },
2372 %arg,
2373 );
2374
2375 $self->{slider}->connect (changed => sub {
2376 my ($self, $value) = @_;
2377 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2378 $self->{parent}->emit (changed => $value);
2379 });
2380
2381# $self->{entry}->connect (changed => sub {
2382# my ($self, $value) = @_;
2383# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2384# $self->{parent}->emit (changed => $value);
2385# });
2386
2387 $self->add ($self->{slider}, $self->{entry});
2388
2389 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2390
2391 $self
2392}
2393
2394sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) }
2180 2396
2181############################################################################# 2397#############################################################################
2182 2398
2183package CFClient::UI::TextView; 2399package CFClient::UI::TextView;
2184 2400
… …
2214 2430
2215 $self->{fontsize} = $fontsize; 2431 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2432 $self->reflow;
2217} 2433}
2218 2434
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_markup ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2435sub size_allocate {
2239 my ($self, $w, $h) = @_; 2436 my ($self, $w, $h) = @_;
2240 2437
2241 $self->SUPER::size_allocate ($w, $h); 2438 $self->SUPER::size_allocate ($w, $h);
2242 2439
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2442 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2443
2247 $self->reflow; 2444 $self->reflow;
2248} 2445}
2249 2446
2447sub text_size {
2448 my ($self, $text, $indent) = @_;
2449
2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent);
2454 $layout->set_markup ($text);
2455
2456 $layout->size
2457}
2458
2459sub reflow {
2460 my ($self) = @_;
2461
2462 $self->{need_reflow}++;
2463 $self->update;
2464}
2465
2466sub set_offset {
2467 my ($self, $offset) = @_;
2468
2469 # todo: base offset on lines or so, not on pixels
2470 $self->{children}[1]->set_value ($offset);
2471}
2472
2473sub clear {
2474 my ($self) = @_;
2475
2476 $self->{par} = [];
2477 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479}
2480
2250sub add_paragraph { 2481sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2482 my ($self, $color, $text, $indent) = @_;
2252 2483
2253 #TODO: intelligently "reformat" paragraph 2484 for my $line (split /\n/, $text) {
2254 2485 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2486 $self->{height} += $h;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2488 }
2258 2489
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2491}
2264 2492
2265sub update { 2493sub update {
2266 my ($self) = @_; 2494 my ($self) = @_;
2267 2495
… …
2270 return unless $self->{h} > 0; 2498 return unless $self->{h} > 0;
2271 2499
2272 delete $self->{texture}; 2500 delete $self->{texture};
2273 2501
2274 $ROOT->on_post_alloc ($self, sub { 2502 $ROOT->on_post_alloc ($self, sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504
2275 if (delete $self->{need_reflow}) { 2505 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2506 my $height = 0;
2277 2507
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2279 for @{$self->{par}}; 2512 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h;
2519 }
2520
2521 $height += $_->[1];
2522 }
2280 2523
2281 $self->{height} = $height; 2524 $self->{height} = $height;
2282 2525
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2527
2285 delete $self->{texture}; 2528 delete $self->{texture};
2286 } 2529 }
2287 2530
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2532 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2533 glClear GL_COLOR_BUFFER_BIT;
2291 2534
2292 glEnable GL_TEXTURE_2D;
2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295 my $top = int $self->{children}[1]{range}[0]; 2535 my $top = int $self->{children}[1]{range}[0];
2296 2536
2297 my $y0 = $top; 2537 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2538 my $y1 = $top + $H;
2299 2539
2300 my $y = 0; 2540 my $y = 0;
2301 2541
2302 my $layout = $self->{layout}; 2542 my $layout = $self->{layout};
2303 2543
2304 $layout->set_font ($self->{font}) if $self->{font}; 2544 $layout->set_font ($self->{font}) if $self->{font};
2305 2545
2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2306 for my $par (@{$self->{par}}) { 2550 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2551 my $h = $par->[1];
2308 2552
2309 if ($y0 < $y + $h && $y < $y1) { 2553 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2554 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2556 $layout->set_markup ($par->[4]);
2312 2557
2313 my ($W, $H) = $layout->size; 2558 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2559
2560 glRasterPos $par->[3], $y - $y0;
2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315 } 2562 }
2316 2563
2317 $y += $h; 2564 $y += $h;
2318 } 2565 }
2319 2566
2320 glDisable GL_TEXTURE_2D; 2567 glDisable GL_BLEND;
2321 }; 2568 };
2322 }); 2569 });
2323} 2570}
2324 2571
2325sub _draw { 2572sub _draw {
2326 my ($self) = @_; 2573 my ($self) = @_;
2327 2574
2328 glEnable GL_TEXTURE_2D; 2575 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2577 glColor 1, 1, 1, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332 glDisable GL_TEXTURE_2D; 2579 glDisable GL_TEXTURE_2D;
2333 2580
2334 $self->{children}[1]->draw; 2581 $self->{children}[1]->draw;
2335 2582
2336} 2583}
… …
2385 2632
2386sub new { 2633sub new {
2387 my $class = shift; 2634 my $class = shift;
2388 2635
2389 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2390 state => 0, 2637 state => 0,
2391 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2392 @_ 2639 @_
2393 ); 2640 );
2394 2641
2395 if ($self->{state}) {
2396 $self->{state} = 0;
2397 $self->toggle_flopper;
2398 }
2399
2400 $self 2642 $self
2401} 2643}
2402 2644
2403sub toggle_flopper { 2645sub toggle_flopper {
2404 my ($self) = @_; 2646 my ($self) = @_;
2405 2647
2406 # TODO: use animation 2648 $self->{other}->toggle_visibility;
2407 if ($self->{state} = !$self->{state}) {
2408 $CFClient::UI::ROOT->add ($self->{other});
2409 $self->{other}->move ($self->coord2global (0, $self->{h}));
2410 $self->emit ("open");
2411 } else {
2412 $CFClient::UI::ROOT->remove ($self->{other});
2413 $self->emit ("close");
2414 }
2415
2416 $self->emit (changed => $self->{state});
2417} 2649}
2418 2650
2419############################################################################# 2651#############################################################################
2420 2652
2421package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
… …
2434} 2666}
2435 2667
2436sub set_tooltip_from { 2668sub set_tooltip_from {
2437 my ($self, $widget) = @_; 2669 my ($self, $widget) = @_;
2438 2670
2671 my $tooltip = $widget->{tooltip};
2672
2673 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}";
2678 }
2679
2439 $self->add (new CFClient::UI::Label 2680 $self->add (new CFClient::UI::Label
2440 markup => $widget->{tooltip}, 2681 markup => $tooltip,
2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8, 2683 fontsize => 0.8,
2443 fg => [0, 0, 0, 1], 2684 fg => [0, 0, 0, 1],
2444 ellipsise => 0, 2685 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP), 2686 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2456 2697
2457sub size_allocate { 2698sub size_allocate {
2458 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2459 2700
2460 $self->SUPER::size_allocate ($w - 4, $h - 4); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2702}
2703
2704sub visibility_change {
2705 my ($self, $visible) = @_;
2706
2707 return unless $visible;
2708
2709 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner}
2711 or return;
2712
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH;
2717
2718 $self->move_abs ($x, $y);
2719 });
2461} 2720}
2462 2721
2463sub _draw { 2722sub _draw {
2464 my ($self) = @_; 2723 my ($self) = @_;
2465 2724
… …
2482 glVertex $w, $h; 2741 glVertex $w, $h;
2483 glVertex $w, 0; 2742 glVertex $w, 0;
2484 glEnd; 2743 glEnd;
2485 2744
2486 glTranslate 2 - 0.375, 2 - 0.375; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2746
2487 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2488} 2748}
2489 2749
2490############################################################################# 2750#############################################################################
2491 2751
… …
2496use CFClient::OpenGL; 2756use CFClient::OpenGL;
2497 2757
2498sub new { 2758sub new {
2499 my $class = shift; 2759 my $class = shift;
2500 2760
2501 $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2502 aspect => 1, 2762 aspect => 1,
2763 can_events => 0,
2503 @_, 2764 @_,
2504 ) 2765 );
2766
2767 if ($self->{anim} && $self->{animspeed}) {
2768 Scalar::Util::weaken (my $widget = $self);
2769
2770 $self->{timer} = Event->timer (
2771 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2772 hard => 1,
2773 interval => $self->{animspeed},
2774 cb => sub {
2775 ++$widget->{frame};
2776 $widget->update;
2777 },
2778 );
2779 }
2780
2781 $self
2505} 2782}
2506 2783
2507sub size_request { 2784sub size_request {
2508 (32, 8) 2785 (32, 8)
2509} 2786}
2510 2787
2788sub update {
2789 my ($self) = @_;
2790
2791 return unless $self->{visible};
2792
2793 $self->SUPER::update;
2794}
2795
2511sub _draw { 2796sub _draw {
2512 my ($self) = @_; 2797 my ($self) = @_;
2513 2798
2514 return unless $::CONN;#d# manage and cache textures differently 2799 return unless $::CONN;
2800
2801 my $face;
2802
2803 if ($self->{frame}) {
2804 my $anim = $::CONN->{anim}[$self->{anim}];
2805
2806 $face = $anim->[ $self->{frame} % @$anim ]
2807 if $anim && @$anim;
2808 }
2809
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2811
2517 # TODO animation
2518 if ($tex) { 2812 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2813 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2815 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2817 glDisable GL_TEXTURE_2D;
2524 } 2818 }
2525} 2819}
2526 2820
2527############################################################################# 2821sub DESTROY {
2528
2529package CFClient::UI::InventoryItem;
2530
2531our @ISA = CFClient::UI::HBox::;
2532
2533sub _item_to_desc {
2534 my ($item) = @_; 2822 my ($self) = @_;
2535 2823
2536 my $desc = 2824 $self->{timer}->cancel
2537 $item->{nrof} < 2 2825 if $self->{timer};
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540 2826
2541 $item->{flags} & Crossfire::Protocol::F_OPEN 2827 $self->SUPER::DESTROY;
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2559sub new {
2560 my $class = shift;
2561
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2568 my $self = $class->SUPER::new (
2569 can_hover => 1,
2570 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_;
2575
2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2584 $::CONN->send ("move $targ $item->{tag} 0");
2585 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) {
2588 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ],
2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 }
2601
2602 1
2603 },
2604 %args
2605 );
2606
2607
2608 $self->add (new CFClient::UI::Face
2609 can_events => 0,
2610 face => $item->{face},
2611 anim => $item->{anim},
2612 animspeed => $item->{animspeed},
2613 );
2614
2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2620
2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Inventory;
2635
2636our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638sub new {
2639 my $class = shift;
2640
2641 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox),
2643 @_,
2644 );
2645
2646 $self
2647}
2648
2649sub set_items {
2650 my ($self, $items) = @_;
2651
2652 $self->{scrolled}->clear;
2653 return unless $items;
2654
2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2659
2660 $self->{real_items} = \@items;
2661
2662 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2665 }
2666
2667 $self->{scrolled}->add (@items);
2668
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670}
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675} 2828}
2676 2829
2677############################################################################# 2830#############################################################################
2678 2831
2679package CFClient::UI::Menu; 2832package CFClient::UI::Menu;
… …
2714 2867
2715# popup given the event (must be a mouse button down event currently) 2868# popup given the event (must be a mouse button down event currently)
2716sub popup { 2869sub popup {
2717 my ($self, $ev) = @_; 2870 my ($self, $ev) = @_;
2718 2871
2719 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2720 2873
2721 # maybe save $GRAB? must be careful about events... 2874 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 2875 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 2876 $self->{button} = $ev->{button};
2724 2877
2725 $self->show; 2878 $self->show;
2726 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2727} 2880}
2728 2881
2729sub mouse_motion { 2882sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_; 2883 my ($self, $ev, $x, $y) = @_;
2731 2884
… …
2739 2892
2740 if ($ev->{button} == $self->{button}) { 2893 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 2894 undef $GRAB;
2742 $self->hide; 2895 $self->hide;
2743 2896
2744 $self->emit ("popdown"); 2897 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 2898 $self->{hover}[1]->() if $self->{hover};
2746 } 2899 }
2747} 2900}
2748 2901
2749############################################################################# 2902#############################################################################
… …
2811sub add { 2964sub add {
2812 my ($self, $text, %arg) = @_; 2965 my ($self, $text, %arg) = @_;
2813 2966
2814 $text =~ s/^\s+//; 2967 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//; 2968 $text =~ s/\s+$//;
2969
2970 return unless $text;
2816 2971
2817 my $timeout = time + ((delete $arg{timeout}) || 60); 2972 my $timeout = time + ((delete $arg{timeout}) || 60);
2818 2973
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820 2975
… …
2854 $self->SUPER::reconfigure; 3009 $self->SUPER::reconfigure;
2855} 3010}
2856 3011
2857############################################################################# 3012#############################################################################
2858 3013
2859package CFClient::UI::Root; 3014package CFClient::UI::Inventory;
2860 3015
2861our @ISA = CFClient::UI::Container::; 3016our @ISA = CFClient::UI::ScrolledWindow::;
2862
2863use CFClient::OpenGL;
2864 3017
2865sub new { 3018sub new {
2866 my $class = shift; 3019 my $class = shift;
2867 3020
2868 $class->SUPER::new ( 3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2869 @_, 3023 @_,
2870 ) 3024 );
2871}
2872 3025
2873sub configure { 3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156# if $commit is true, the binding will be set after the user entered a key combo
3157sub ask_for_bind {
3158 my ($self, $commit) = @_;
3159
3160 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_;
3162 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3163 $self->update_binding_widgets;
3164 $self->commit if $commit;
3165 });
3166}
3167
3168# $mod and $sym are the modifiers and key symbol
3169# $cmds is a array ref of strings (the commands)
3170# $cb is the callback that is executed on OK
3171# $ccb is the callback that is executed on CANCEL and
3172# when the binding was unsuccessful on OK
3173sub set_binding {
2874 my ($self, $x, $y, $w, $h) = @_; 3174 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2875 3175
2876 $self->{w} = $w; 3176 $self->clear_command_list;
2877 $self->{h} = $h; 3177 $self->{recording} = 0;
2878} 3178 $self->{rec_btn}->set_text ("start recording");
2879 3179
2880sub check_size { 3180 $self->{binding} = [$mod, $sym];
3181 $self->{commands} = $cmds;
3182
3183 $self->{binding_change} = $cb;
3184 $self->{binding_cancel} = $ccb;
3185
3186 $self->update_binding_widgets;
3187}
3188
3189# this is a shortcut method that asks for a binding
3190# and then just binds it.
3191sub do_quick_binding {
2881 my ($self) = @_; 3192 my ($self, $cmds) = @_;
3193 $self->set_binding (undef, undef, $cmds, sub {
3194 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3195 });
3196 $self->ask_for_bind (1);
3197}
2882 3198
2883 $self->size_allocate ($self->{w}, $self->{h}) 3199sub update_binding_widgets {
2884 if $self->{w}; 3200 my ($self) = @_;
3201 my ($mod, $sym, $cmds) = $self->get_binding;
3202 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3203 $self->set_command_list ($cmds);
3204}
3205
3206sub get_binding {
3207 my ($self) = @_;
3208 return (
3209 $self->{binding}->[0],
3210 $self->{binding}->[1],
3211 [ grep { defined $_ } @{$self->{commands}} ]
3212 );
3213}
3214
3215sub clear_command_list {
3216 my ($self) = @_;
3217 $self->{cmdbox}->clear ();
3218}
3219
3220sub set_command_list {
3221 my ($self, $cmds) = @_;
3222
3223 $self->{cmdbox}->clear ();
3224 $self->{commands} = $cmds;
3225
3226 my $idx = 0;
3227
3228 for (@$cmds) {
3229 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3230
3231 my $i = $idx;
3232 $hb->add (new CFClient::UI::Label text => $_);
3233 $hb->add (new CFClient::UI::Button
3234 text => "delete",
3235 tooltip => "Deletes the action from the record",
3236 on_activate => sub {
3237 $self->{cmdbox}->remove ($hb);
3238 $cmds->[$i] = undef;
3239 });
3240
3241
3242 $idx++
3243 }
3244}
3245
3246#############################################################################
3247
3248package CFClient::UI::SpellList;
3249
3250our @ISA = CFClient::UI::FancyFrame::;
3251
3252sub new {
3253 my $class = shift;
3254
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3256
3257 $self->add (new CFClient::UI::ScrolledWindow
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3259
3260 $self;
3261}
3262
3263# XXX: Do sorting? Argl...
3264sub add_spell {
3265 my ($self, $spell) = @_;
3266 $self->{spells}->{$spell->{name}} = $spell;
3267
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face},
3270 can_hover => 1,
3271 can_events => 1,
3272 tooltip => $spell->{message});
3273
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name},
3276 can_hover => 1,
3277 can_events => 1,
3278 tooltip => $spell->{message},
3279 expand => 1);
3280
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1);
3285
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289}
3290
3291sub rebuild_spell_list {
3292 my ($self) = @_;
3293 $self->{tbl_idx} = 0;
3294 $self->add_spell ($_) for values %{$self->{spells}};
3295}
3296
3297sub remove_spell {
3298 my ($self, $spell) = @_;
3299 delete $self->{spells}->{$spell->{name}};
3300 $self->rebuild_spell_list;
3301}
3302
3303#############################################################################
3304
3305package CFClient::UI::Root;
3306
3307our @ISA = CFClient::UI::Container::;
3308
3309use CFClient::OpenGL;
3310
3311sub new {
3312 my $class = shift;
3313
3314 my $self = $class->SUPER::new (
3315 visible => 1,
3316 @_,
3317 );
3318
3319 Scalar::Util::weaken ($self->{root} = $self);
3320
3321 $self
2885} 3322}
2886 3323
2887sub size_request { 3324sub size_request {
2888 my ($self) = @_; 3325 my ($self) = @_;
2889 3326
2890 ($self->{w}, $self->{h}) 3327 ($self->{w}, $self->{h})
3328}
3329
3330sub _to_pixel {
3331 my ($coord, $size, $max) = @_;
3332
3333 $coord =
3334 $coord eq "center" ? ($max - $size) * 0.5
3335 : $coord eq "max" ? $max
3336 : $coord;
3337
3338 $coord = 0 if $coord < 0;
3339 $coord = $max - $size if $coord > $max - $size;
3340
3341 int $coord + 0.5
2891} 3342}
2892 3343
2893sub size_allocate { 3344sub size_allocate {
2894 my ($self, $w, $h) = @_; 3345 my ($self, $w, $h) = @_;
2895 3346
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2902 for my $child ($self->children) { 3347 for my $child ($self->children) {
2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2904 3349
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3350 $X = $child->{force_x} if exists $child->{force_x};
2906 if exists $child->{req_x}; 3351 $Y = $child->{force_y} if exists $child->{force_y};
2907 3352
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3353 $X = _to_pixel $X, $W, $self->{w};
2909 if exists $child->{req_y}; 3354 $Y = _to_pixel $Y, $H, $self->{h};
2910
2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913 3355
2914 $child->configure ($X, $Y, $W, $H); 3356 $child->configure ($X, $Y, $W, $H);
2915 } 3357 }
2916} 3358}
2917 3359
… …
2928} 3370}
2929 3371
2930sub update { 3372sub update {
2931 my ($self) = @_; 3373 my ($self) = @_;
2932 3374
2933 $self->check_size;
2934 $::WANT_REFRESH++; 3375 $::WANT_REFRESH++;
2935} 3376}
2936 3377
2937sub add { 3378sub add {
2938 my ($self, @children) = @_; 3379 my ($self, @children) = @_;
2939 3380
2940 for my $child (@children) {
2941 $child->{toplevel} = 1; 3381 $_->{is_toplevel} = 1
2942 3382 for @children;
2943 # integerise window positions
2944 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y};
2946 }
2947 3383
2948 $self->SUPER::add (@children); 3384 $self->SUPER::add (@children);
3385}
3386
3387sub remove {
3388 my ($self, @children) = @_;
3389
3390 $self->SUPER::remove (@children);
3391
3392 delete $self->{is_toplevel}
3393 for @children;
3394
3395 while (@children) {
3396 my $w = pop @children;
3397 push @children, $w->children;
3398 $w->set_invisible;
3399 }
2949} 3400}
2950 3401
2951sub on_refresh { 3402sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3403 my ($self, $id, $cb) = @_;
2953 3404
… …
2966 while ($self->{refresh_hook}) { 3417 while ($self->{refresh_hook}) {
2967 $_->() 3418 $_->()
2968 for values %{delete $self->{refresh_hook}}; 3419 for values %{delete $self->{refresh_hook}};
2969 } 3420 }
2970 3421
2971 if ($self->{check_size}) { 3422 if ($self->{realloc}) {
2972 my @queue = ([], []); 3423 my %queue;
3424 my @queue;
3425 my $widget;
2973 3426
2974 for (;;) { 3427 outer:
2975 if ($self->{check_size}) { 3428 while () {
2976 # heuristic: check containers last 3429 if (my $realloc = delete $self->{realloc}) {
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3430 for $widget (values %$realloc) {
2978 for values %{delete $self->{check_size}} 3431 $widget->{visible} or next; # do not resize invisible widgets
3432
3433 $queue{$widget+0}++ and next; # duplicates are common
3434
3435 push @{ $queue[$widget->{visible}] }, $widget;
3436 }
2979 } 3437 }
2980 3438
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3439 while () {
3440 @queue or last outer;
2982 3441
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3442 $widget = pop @{ $queue[-1] || [] }
2984 ? @$widget{qw(user_w user_h)} 3443 and last;
2985 : $widget->size_request;
2986
2987 if (delete $widget->{force_alloc}
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990 3444
3445 pop @queue;
3446 }
3447
3448 delete $queue{$widget+0};
3449
3450 my ($w, $h) = $widget->size_request;
3451
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3454
3455 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h};
3457
3458 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3459 || delete $widget->{force_realloc}) {
2991 $widget->{req_w} = $w; 3460 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h; 3461 $widget->{req_h} = $h;
2993 3462
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3463 $self->{size_alloc}{$widget+0} = $widget;
2995 3464
2996 $widget->{parent}->check_size
2997 if $widget->{parent}; 3465 if (my $parent = $widget->{parent}) {
3466 $self->{realloc}{$parent+0} = $parent
3467 unless $queue{$parent+0};
3468
3469 $parent->{force_size_alloc} = 1;
3470 $self->{size_alloc}{$parent+0} = $parent;
3471 }
2998 } 3472 }
3473
3474 delete $self->{realloc}{$widget+0};
2999 } 3475 }
3000 } 3476 }
3001 3477
3002 while ($self->{size_alloc}) { 3478 while (my $size_alloc = delete $self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) { 3479 my @queue = sort { $b->{visible} <=> $a->{visible} }
3004 my ($widget, $w, $h) = @$_; 3480 values %$size_alloc;
3481
3482 while () {
3483 my $widget = pop @queue || last;
3484
3485 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3005 3486
3006 $w = 0 if $w < 0; 3487 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3488 $h = 0 if $h < 0;
3008 3489
3490 $w = int $w + 0.5;
3491 $h = int $h + 0.5;
3492
3493 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3494 $widget->{old_w} = $widget->{w};
3495 $widget->{old_h} = $widget->{h};
3496
3009 $widget->{w} = $w; 3497 $widget->{w} = $w;
3010 $widget->{h} = $h; 3498 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h); 3499
3012 $widget->emit (size_allocate => $w, $h); 3500 $widget->emit (size_allocate => $w, $h);
3501 }
3013 } 3502 }
3014 } 3503 }
3015 3504
3016 while ($self->{post_alloc_hook}) { 3505 while ($self->{post_alloc_hook}) {
3017 $_->() 3506 $_->()
3018 for values %{delete $self->{post_alloc_hook}}; 3507 for values %{delete $self->{post_alloc_hook}};
3019 } 3508 }
3020 3509
3510
3021 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3511 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3512 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3513 glClear GL_COLOR_BUFFER_BIT;
3024 3514
3025 glMatrixMode GL_PROJECTION; 3515 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3516 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3517 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3518 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3519 glLoadIdentity;
3030 3520
3521 {
3522 package CFClient::UI::Base;
3523
3524 ($draw_x, $draw_y, $draw_w, $draw_h) =
3525 (0, 0, $self->{w}, $self->{h});
3526 }
3527
3031 $self->_draw; 3528 $self->_draw;
3032} 3529}
3033 3530
3034############################################################################# 3531#############################################################################
3035 3532

Diff Legend

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