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

Diff Legend

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