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.213 by root, Wed May 17 15:18:57 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 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 173 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 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
150 $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.]+$/;
151 $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};
152 $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};
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}; 181 $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}; 182 $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}; 183 $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}; 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
158 } 188 }
159
160 $widget->reconfigure;
161 } 189 }
190
191 reconfigure_widgets;
162} 192}
163 193
164############################################################################# 194#############################################################################
165 195
166package CFClient::UI::Base; 196package CFClient::UI::Base;
… …
171 201
172sub new { 202sub new {
173 my $class = shift; 203 my $class = shift;
174 204
175 my $self = bless { 205 my $self = bless {
176 x => 0, 206 x => "center",
177 y => 0, 207 y => "center",
178 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
179 can_events => 1, 211 can_events => 1,
180 @_ 212 @_
181 }, $class; 213 }, $class;
182 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
183 for (keys %$self) { 217 for (keys %$self) {
184 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
186 } 220 }
187 } 221 }
188 222
189 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 }
190 234
191 $self 235 $self
192} 236}
193 237
194sub destroy { 238sub destroy {
… …
204 return if $self->{parent}; 248 return if $self->{parent};
205 249
206 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
207} 251}
208 252
209sub hide { 253sub set_visible {
210 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};
211 277
212 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
216 if $self->{parent}; 312 if $self->{parent};
217} 313}
218 314
219sub move { 315sub move_abs {
220 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
221 317
222 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
225 321
226 $self->update; 322 $self->update;
227} 323}
228 324
229sub set_size { 325sub set_size {
230 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
231 327
232 $self->{user_w} = $w; 328 $self->{force_w} = $w;
233 $self->{user_h} = $h; 329 $self->{force_h} = $h;
234 330
235 $self->check_size; 331 $self->realloc;
236} 332}
237 333
238sub size_request { 334sub size_request {
239 require Carp; 335 require Carp;
240 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
242 338
243sub configure { 339sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
245 341
246 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
249 347
250 # use alignment to adjust x, y 348 # use alignment to adjust x, y
251 349
252 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 352 }
257 353
258 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 355 $self->{x} = $x;
260 $self->{y} = $y; 356 $self->{y} = $y;
261 $self->update; 357 $self->update;
262 } 358 }
263 359
264 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $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;
266 } 367 }
267} 368}
268 369
269sub size_allocate { 370sub size_allocate {
270 # nothing to be done 371 # nothing to be done
271} 372}
272 373
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 374sub children {
281} 375}
282 376
283sub set_max_size { 377sub set_max_size {
284 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 382}
289 383
290sub set_tooltip { 384sub set_tooltip {
291 my ($self, $tooltip) = @_; 385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
292 391
293 $self->{tooltip} = $tooltip; 392 $self->{tooltip} = $tooltip;
294 393
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 395 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 417 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
320 419
321 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
322 421
323 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
324 423
325 $focus->update if $focus; 424 $focus->update if $focus;
326 $FOCUS->update; 425 $FOCUS->update;
327} 426}
328 427
… …
331 430
332 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
333 432
334 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
335 434
336 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
337 436
338 $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;
339} 441}
340 442
341sub mouse_motion { } 443sub mouse_motion { }
342sub button_up { } 444sub button_up { }
343sub key_down { } 445sub key_down { }
344sub key_up { } 446sub key_up { }
345 447
346sub button_down { 448sub button_down {
347 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
348 450
349 $self->focus_in; 451 $self->focus_in;
… …
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
356sub 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}
357 529
358sub draw { 530sub draw {
359 my ($self) = @_; 531 my ($self) = @_;
360 532
361 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
378 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
379 glEnd; 551 glEnd;
380 glDisable GL_BLEND; 552 glDisable GL_BLEND;
381 } 553 }
382 554
383 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
384 glPushMatrix; 556 glPushMatrix;
385 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 560 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
392 glEnd; 564 glEnd;
393 glPopMatrix; 565 glPopMatrix;
394 #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;
395 } 567 }
396} 568}
397 569
398sub _draw { 570sub _draw {
399 my ($self) = @_; 571 my ($self) = @_;
400 572
401 warn "no draw defined for $self\n"; 573 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} 574}
451 575
452sub DESTROY { 576sub DESTROY {
453 my ($self) = @_; 577 my ($self) = @_;
454 578
… …
512 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
514} 638}
515 639
516sub size_request { 640sub size_request {
517 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
518} 644}
519 645
520sub draw { } 646sub draw { }
521 647
522############################################################################# 648#############################################################################
… …
551 $self->{children} = [ 677 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
554 ]; 680 ];
555 681
556 $self->check_size (1); 682 $self->realloc;
557 $self->update;
558} 683}
559 684
560sub children { 685sub children {
561 @{ $_[0]{children} } 686 @{ $_[0]{children} }
562} 687}
… …
567 delete $child->{parent}; 692 delete $child->{parent};
568 $child->hide; 693 $child->hide;
569 694
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 696
572 $self->check_size; 697 $self->realloc;
573 $self->update;
574} 698}
575 699
576sub clear { 700sub clear {
577 my ($self) = @_; 701 my ($self) = @_;
578 702
… …
582 for (@$children) { 706 for (@$children) {
583 delete $_->{parent}; 707 delete $_->{parent};
584 $_->hide; 708 $_->hide;
585 } 709 }
586 710
587 $self->check_size; 711 $self->realloc;
588 $self->update;
589} 712}
590 713
591sub find_widget { 714sub find_widget {
592 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
593 716
… …
691 $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 {
692 glClearColor 0, 0, 0, 0; 815 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
694 817
695 $self->_render; 818 $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 }; 819 };
704} 820}
705 821
706sub _draw { 822sub _draw {
707 my ($self) = @_; 823 my ($self) = @_;
… …
711 my $tex = $self->{texture} 827 my $tex = $self->{texture}
712 or return; 828 or return;
713 829
714 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
717 833
718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719 835
720 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
721} 837}
… …
724 840
725package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
726 842
727our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
728 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
729sub size_request { 855sub size_request {
730 my ($self) = @_; 856 my ($self) = @_;
731 857
732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 859
735 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
736} 864}
737 865
738sub size_allocate { 866sub size_allocate {
739 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
740 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);
741 $self->update; 875 $self->update;
742} 876}
743 877
744sub set_offset { 878sub set_offset {
745 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
796 my $class = shift; 930 my $class = shift;
797 931
798 my $self; 932 my $self;
799 933
800 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
801 vertical => 1, 935 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 937 on_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
805 }, 939 },
806 ; 940 ;
807 941
808 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 943 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 944 slider => $slider,
811 @_, 945 @_,
812 ); 946 );
813 947
814 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp}); 949 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
817 951
818 $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]);
819} 972}
820 973
821#TODO# update range on size_allocate depending on child 974#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 975# update viewport offset on scroll
823 976
… …
867 1020
868our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
869 1022
870use CFClient::OpenGL; 1023use CFClient::OpenGL;
871 1024
872my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 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); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
875 1032
876sub new { 1033sub new {
877 my $class = shift; 1034 my $class = shift;
878 1035
879 # TODO: user_x, user_y, overwrite moveto?
880
881 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
884 border => 0.6, 1039 border => 0.6,
885 toplevel => 1,
886 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
887 @_ 1043 @_
888 ); 1044 );
889 1045
890 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
891 align => 0, 1047 align => 0,
… …
944 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
945 1101
946 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
948 1104
949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
952 $self->check_size;
953 }; 1110 };
954 1111
955 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
956 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
957 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
959 $self->{motion} = sub { 1116 $self->{motion} = sub {
960 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
961 1118
962 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
963 1120
964 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
965 $self->update;
966 }; 1122 };
967 } 1123 }
968} 1124}
969 1125
970sub button_up { 1126sub button_up {
… …
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990 1146
991 my $border = $self->border; 1147 my $border = $self->border;
992 1148
993 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
994 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
998 1154
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1000 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1001 1157
1002 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1003 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1004 my $rep_y = $ch / $bg->{h}; 1161 $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); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 } 1163 }
1013 1164
1014 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1015 1166
… …
1031sub new { 1182sub new {
1032 my $class = shift; 1183 my $class = shift;
1033 1184
1034 $class->SUPER::new ( 1185 $class->SUPER::new (
1035 col_expand => [], 1186 col_expand => [],
1036 @_ 1187 @_,
1037 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038} 1193}
1039 1194
1040sub add { 1195sub add {
1041 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1042 1197
1043 $child->set_parent ($self); 1198 $child->set_parent ($self);
1044 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1045 1200
1046 $child->check_size; 1201 $self->realloc;
1047} 1202}
1048 1203
1049sub children {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051}
1052
1053# 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?
1054sub clear { 1205sub clear {
1055 my ($self) = @_; 1206 my ($self) = @_;
1056 1207
1057 my @children = $self->children; 1208 my @children = $self->children;
1058 delete $self->{children}; 1209 delete $self->{children};
… …
1060 for (@children) { 1211 for (@children) {
1061 delete $_->{parent}; 1212 delete $_->{parent};
1062 $_->hide; 1213 $_->hide;
1063 } 1214 }
1064 1215
1065 $self->update; 1216 $self->realloc;
1066} 1217}
1067 1218
1068sub get_wh { 1219sub get_wh {
1069 my ($self) = @_; 1220 my ($self) = @_;
1070 1221
… …
1101sub size_allocate { 1252sub size_allocate {
1102 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1103 1254
1104 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1105 1256
1106 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1107 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1108 1259
1109 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1110 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1111 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1112 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1166 } 1317 }
1167} 1318}
1168 1319
1169############################################################################# 1320#############################################################################
1170 1321
1171package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1172
1173# TODO: wrap into common Box base class
1174 1323
1175our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1176 1325
1177sub size_request { 1326sub size_request {
1178 my ($self) = @_; 1327 my ($self) = @_;
1179 1328
1180 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1181 1330 ? (
1182 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1183 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1184 (List::Util::max map $_->[1], @alloc), 1333 )
1185 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1186} 1338}
1187 1339
1188sub size_allocate { 1340sub size_allocate {
1189 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1190 1342
1191 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1192
1193 my $children = $self->{children}; 1344 my $children = $self->{children};
1194 1345
1195 my @h = map $_->{req_w}, @$children; 1346 my @req;
1196 1347
1197 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1198 1349 @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 { 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 {
1203 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1204 $exp ||= 1;
1205 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1206 for (0 .. $#$children) { 1363 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 } 1364 }
1213 } 1365 }
1214 1366
1215 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1216 1368
1217 my $y = 0; 1369 my $pos = 0;
1218 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1219 my $child = $children->[$_];
1220 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1221 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1222 1373
1223 $y += $h; 1374 $pos += $alloc;
1224 } 1375 }
1225 1376
1226 1 1377 1
1227} 1378}
1228 1379
1229############################################################################# 1380#############################################################################
1230 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
1231package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1232 1398
1233# TODO: wrap into common Box base class
1234
1235our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1236 1400
1237sub size_request { 1401sub new {
1238 my ($self) = @_; 1402 my $class = shift;
1239 1403
1240 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1241 1405 vertical => 1,
1242 ( 1406 @_,
1243 (List::Util::max map $_->[0], @alloc),
1244 (List::Util::sum map $_->[1], @alloc),
1245 ) 1407 )
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} 1408}
1286 1409
1287############################################################################# 1410#############################################################################
1288 1411
1289package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1306 ellipsise => 3, # end 1429 ellipsise => 3, # end
1307 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1308 fontsize => 1, 1431 fontsize => 1,
1309 align => -1, 1432 align => -1,
1310 valign => -1, 1433 valign => -1,
1311 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1312 can_events => 0, 1436 can_events => 0,
1313 %arg 1437 %arg
1314 ); 1438 );
1315 1439
1316 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1352 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1353 1477
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1356 1480
1481 $self->realloc;
1357 $self->update; 1482 $self->update;
1358 $self->check_size;
1359} 1483}
1360 1484
1361sub set_markup { 1485sub set_markup {
1362 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1363 1487
… …
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368 1492
1369 $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;
1370 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1371 1495
1496 $self->realloc;
1372 $self->update; 1497 $self->update;
1373 $self->check_size;
1374} 1498}
1375 1499
1376sub size_request { 1500sub size_request {
1377 my ($self) = @_; 1501 my ($self) = @_;
1378 1502
… …
1392 1516
1393 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1394 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1395 } 1519 }
1396 1520
1397 ( 1521 ($w, $h)
1398 $w + $self->{padding} * 2,
1399 $h + $self->{padding} * 2,
1400 )
1401} 1522}
1402 1523
1403sub size_allocate { 1524sub size_allocate {
1404 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1405 1526
1406 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1407} 1529}
1408 1530
1409sub set_fontsize { 1531sub set_fontsize {
1410 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1411 1533
1412 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1413 delete $self->{texture}; 1535 delete $self->{texture};
1414 1536
1415 $self->update; 1537 $self->realloc;
1416 $self->check_size;
1417} 1538}
1418 1539
1419sub _draw { 1540sub _draw {
1420 my ($self) = @_; 1541 my ($self) = @_;
1421 1542
… …
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1552
1432 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1433 1554
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1436 : ($self->{w} - $tex->{w}) * 0.5); 1557 : ($self->{w} - $tex->{w}) * 0.5);
1437 1558
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1440 : ($self->{h} - $tex->{h}) * 0.5); 1561 : ($self->{h} - $tex->{h}) * 0.5);
1441 1562
1442 $tex 1563 $tex
1443 }; 1564 };
1444 1565
… …
1473 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1474 can_hover => 1, 1595 can_hover => 1,
1475 can_focus => 1, 1596 can_focus => 1,
1476 valign => 0, 1597 valign => 0,
1477 can_events => 1, 1598 can_events => 1,
1599 #text => ...
1478 @_ 1600 @_
1479 ) 1601 )
1480} 1602}
1481 1603
1482sub _set_text { 1604sub _set_text {
… …
1492 $self->{text} = $text; 1614 $self->{text} = $text;
1493 1615
1494 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1496 1618
1497 $self->emit (changed => $self->{text}); 1619 $self->_emit (changed => $self->{text});
1498} 1620}
1499 1621
1500sub set_text { 1622sub set_text {
1501 my ($self, $text) = @_; 1623 my ($self, $text) = @_;
1502 1624
1503 $self->{cursor} = length $text; 1625 $self->{cursor} = length $text;
1504 $self->_set_text ($text); 1626 $self->_set_text ($text);
1505 $self->update; 1627
1506 $self->check_size; 1628 $self->realloc;
1507} 1629}
1508 1630
1509sub get_text { 1631sub get_text {
1510 $_[0]{text} 1632 $_[0]{text}
1511} 1633}
… …
1514 my ($self) = @_; 1636 my ($self) = @_;
1515 1637
1516 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1517 1639
1518 ($w + 1, $h) # add 1 for cursor 1640 ($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} 1641}
1526 1642
1527sub key_down { 1643sub key_down {
1528 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1529 1645
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1664 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1665 $self->_emit ('escape');
1550 } elsif ($uni) { 1666 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1552 } 1668 }
1553 1669
1554 $self->_set_text ($text); 1670 $self->_set_text ($text);
1555 $self->update; 1671
1556 $self->check_size; 1672 $self->realloc;
1557} 1673}
1558 1674
1559sub focus_in { 1675sub focus_in {
1560 my ($self) = @_; 1676 my ($self) = @_;
1561 1677
… …
1641 if ($sym == 13) { 1757 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1758 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1759 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1760 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1761 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1762 $self->_emit (activate => $txt);
1647 $self->update; 1763 $self->update;
1648 1764
1649 } elsif ($sym == CFClient::SDLK_UP) { 1765 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1766 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1767 $self->{history_saveback} = $self->get_text;
… …
1688 1804
1689sub new { 1805sub new {
1690 my $class = shift; 1806 my $class = shift;
1691 1807
1692 $class->SUPER::new ( 1808 $class->SUPER::new (
1693 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1694 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1695 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1696 can_hover => 1, 1813 can_hover => 1,
1697 align => 0, 1814 align => 0,
1698 valign => 0, 1815 valign => 0,
1699 can_events => 1, 1816 can_events => 1,
1700 @_ 1817 @_
1701 ) 1818 )
1702} 1819}
1703 1820
1821sub activate { }
1822
1704sub button_up { 1823sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1824 my ($self, $ev, $x, $y) = @_;
1706 1825
1826 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1827 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1828 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate");
1710 }
1711} 1829}
1712 1830
1713sub _draw { 1831sub _draw {
1714 my ($self) = @_; 1832 my ($self) = @_;
1715 1833
… …
1744 1862
1745sub new { 1863sub new {
1746 my $class = shift; 1864 my $class = shift;
1747 1865
1748 $class->SUPER::new ( 1866 $class->SUPER::new (
1749 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1750 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1751 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2], 1871 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5], 1872 active_bg => [1, 1, 1, 0.5],
1754 state => 0, 1873 state => 0,
… …
1758} 1877}
1759 1878
1760sub size_request { 1879sub size_request {
1761 my ($self) = @_; 1880 my ($self) = @_;
1762 1881
1763 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1764} 1883}
1765 1884
1766sub button_down { 1885sub button_down {
1767 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1768 1887
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1771 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1773 } 1892 }
1774} 1893}
1775 1894
1776sub _draw { 1895sub _draw {
1777 my ($self) = @_; 1896 my ($self) = @_;
1778 1897
1779 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1780 1899
1781 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1782 1901
1783 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;
1784 1905
1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1786 1907
1787 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788 1909
… …
2052 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2176 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2177 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2179 min_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2180 min_h => $::WIDTH / 80,
2060 vertical => 0, 2181 vertical => 0,
2061 can_hover => 1, 2182 can_hover => 1,
2062 inner_pad => .05, 2183 inner_pad => 0.02,
2063 @_ 2184 @_
2064 ); 2185 );
2065 2186
2066 $self->set_value ($self->{range}[0]); 2187 $self->set_value ($self->{range}[0]);
2067 $self->update; 2188 $self->update;
2068 2189
2069 $self 2190 $self
2070} 2191}
2071 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
2072sub set_value { 2204sub set_value {
2073 my ($self, $value) = @_; 2205 my ($self, $value) = @_;
2074 2206
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2207 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2208
2077 $hi = $lo + 1 if $hi <= $lo; 2209 $hi = $lo + 1 if $hi <= $lo;
2078 2210
2211 $page = $hi - $lo if $page > $hi - $lo;
2212
2079 $value = $lo if $value < $lo; 2213 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2214 $value = $hi - $page if $value > $hi - $page;
2081 2215
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2216 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2217 if $unit;
2084 2218
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2220
2089 if ($value != $old_value) { 2221 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2222 $self->_emit (changed => $value);
2091 $self->update; 2223 $self->update;
2092 } 2224 }
2093} 2225}
2094 2226
2095sub size_request { 2227sub size_request {
2096 my ($self) = @_; 2228 my ($self) = @_;
2097 2229
2098 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
2099 my $h = $self->{req_h};
2100
2101 $self->{vertical} ? ($h, $w) : ($w, $h)
2102} 2231}
2103 2232
2104sub button_down { 2233sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
2106 2235
2107 $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
2108 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
2109} 2241}
2110 2242
2111sub mouse_motion { 2243sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
… …
2114 if ($GRAB == $self) { 2246 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2248
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2249 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2250
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2252
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122 } 2254 }
2123} 2255}
2124 2256
2125sub update { 2257sub update {
2126 my ($self) = @_; 2258 my ($self) = @_;
2127 2259
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]); 2261 $self->set_value ($self->{range}[0]);
2130 2262
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
2132 2265
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2267
2135 $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;
2136 2270
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2271 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2272 $value = $value * $self->{scale} + $self->{offset};
2139 2273
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; 2274 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2275 $self->{knob_w} = $knob_w;
2147 }); 2276 });
2148 2277
2149 $self->SUPER::update; 2278 $self->SUPER::update;
2150} 2279}
2151 2280
… …
2157 glScale $self->{w}, $self->{h}; 2286 glScale $self->{w}, $self->{h};
2158 2287
2159 if ($self->{vertical}) { 2288 if ($self->{vertical}) {
2160 # draw a vertical slider like a rotated horizontal slider 2289 # draw a vertical slider like a rotated horizontal slider
2161 2290
2291 glTranslate 1, 0, 0;
2162 glRotate 90, 0, 0, 1; 2292 glRotate 90, 0, 0, 1;
2163 glTranslate 0, 1, 0;
2164 } 2293 }
2165 2294
2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2295 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2296 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2168 2297
… …
2175 # draw handle 2304 # draw handle
2176 $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);
2177 2306
2178 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
2179} 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 (@_) }
2180 2350
2181############################################################################# 2351#############################################################################
2182 2352
2183package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
2184 2354
… …
2214 2384
2215 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2386 $self->reflow;
2217} 2387}
2218 2388
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 { 2389sub size_allocate {
2239 my ($self, $w, $h) = @_; 2390 my ($self, $w, $h) = @_;
2240 2391
2241 $self->SUPER::size_allocate ($w, $h); 2392 $self->SUPER::size_allocate ($w, $h);
2242 2393
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2397
2247 $self->reflow; 2398 $self->reflow;
2248} 2399}
2249 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
2250sub add_paragraph { 2435sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2436 my ($self, $color, $text, $indent) = @_;
2252 2437
2253 #TODO: intelligently "reformat" paragraph 2438 for my $line (split /\n/, $text) {
2254 2439 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2440 $self->{height} += $h;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2442 }
2258 2443
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $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]);
2262 $self->{children}[1]->update;
2263} 2445}
2264 2446
2265sub update { 2447sub update {
2266 my ($self) = @_; 2448 my ($self) = @_;
2267 2449
… …
2270 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
2271 2453
2272 delete $self->{texture}; 2454 delete $self->{texture};
2273 2455
2274 $ROOT->on_post_alloc ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
2275 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2460 my $height = 0;
2277 2461
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2279 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 }
2280 2477
2281 $self->{height} = $height; 2478 $self->{height} = $height;
2282 2479
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2481
2285 delete $self->{texture}; 2482 delete $self->{texture};
2286 } 2483 }
2287 2484
2288 $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 {
2289 glClearColor 0, 0, 0, 0; 2486 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
2291 2488
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]; 2489 my $top = int $self->{children}[1]{range}[0];
2296 2490
2297 my $y0 = $top; 2491 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2492 my $y1 = $top + $H;
2299 2493
2300 my $y = 0; 2494 my $y = 0;
2301 2495
2302 my $layout = $self->{layout}; 2496 my $layout = $self->{layout};
2303 2497
2304 $layout->set_font ($self->{font}) if $self->{font}; 2498 $layout->set_font ($self->{font}) if $self->{font};
2305 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
2306 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2505 my $h = $par->[1];
2308 2506
2309 if ($y0 < $y + $h && $y < $y1) { 2507 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2508 $layout->set_foreground (@{ $par->[2] });
2509 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2510 $layout->set_markup ($par->[4]);
2312 2511
2313 my ($W, $H) = $layout->size; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 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;
2315 } 2516 }
2316 2517
2317 $y += $h; 2518 $y += $h;
2318 } 2519 }
2319 2520
2320 glDisable GL_TEXTURE_2D; 2521 glDisable GL_BLEND;
2321 }; 2522 };
2322 }); 2523 });
2323} 2524}
2324 2525
2325sub _draw { 2526sub _draw {
2326 my ($self) = @_; 2527 my ($self) = @_;
2327 2528
2328 glEnable GL_TEXTURE_2D; 2529 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2531 glColor 1, 1, 1, 1;
2331 $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});
2332 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
2333 2534
2334 $self->{children}[1]->draw; 2535 $self->{children}[1]->draw;
2335 2536
2336} 2537}
… …
2385 2586
2386sub new { 2587sub new {
2387 my $class = shift; 2588 my $class = shift;
2388 2589
2389 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2390 state => 0, 2591 state => 0,
2391 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2392 @_ 2593 @_
2393 ); 2594 );
2394 2595
2395 if ($self->{state}) {
2396 $self->{state} = 0;
2397 $self->toggle_flopper;
2398 }
2399
2400 $self 2596 $self
2401} 2597}
2402 2598
2403sub toggle_flopper { 2599sub toggle_flopper {
2404 my ($self) = @_; 2600 my ($self) = @_;
2405 2601
2406 # TODO: use animation 2602 $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} 2603}
2418 2604
2419############################################################################# 2605#############################################################################
2420 2606
2421package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2434} 2620}
2435 2621
2436sub set_tooltip_from { 2622sub set_tooltip_from {
2437 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2438 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
2439 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2440 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8, 2637 fontsize => 0.8,
2443 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2444 ellipsise => 0, 2639 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2456 2651
2457sub size_allocate { 2652sub size_allocate {
2458 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2459 2654
2460 $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 });
2461} 2674}
2462 2675
2463sub _draw { 2676sub _draw {
2464 my ($self) = @_; 2677 my ($self) = @_;
2465 2678
… …
2482 glVertex $w, $h; 2695 glVertex $w, $h;
2483 glVertex $w, 0; 2696 glVertex $w, 0;
2484 glEnd; 2697 glEnd;
2485 2698
2486 glTranslate 2 - 0.375, 2 - 0.375; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2700
2487 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2488} 2702}
2489 2703
2490############################################################################# 2704#############################################################################
2491 2705
… …
2496use CFClient::OpenGL; 2710use CFClient::OpenGL;
2497 2711
2498sub new { 2712sub new {
2499 my $class = shift; 2713 my $class = shift;
2500 2714
2501 $class->SUPER::new ( 2715 my $self = $class->SUPER::new (
2502 aspect => 1, 2716 aspect => 1,
2717 can_events => 0,
2503 @_, 2718 @_,
2504 ) 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
2505} 2736}
2506 2737
2507sub size_request { 2738sub size_request {
2508 (32, 8) 2739 (32, 8)
2509} 2740}
2510 2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2511sub _draw { 2750sub _draw {
2512 my ($self) = @_; 2751 my ($self) = @_;
2513 2752
2514 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
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2765
2517 # TODO animation
2518 if ($tex) { 2766 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2767 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2769 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2524 } 2772 }
2525} 2773}
2526 2774
2775sub DESTROY {
2776 my ($self) = @_;
2777
2778 $self->{timer}->cancel
2779 if $self->{timer};
2780
2781 $self->SUPER::DESTROY;
2782}
2783
2527############################################################################# 2784#############################################################################
2528 2785
2529package CFClient::UI::InventoryItem; 2786package CFClient::UI::Inventory;
2530 2787
2531our @ISA = CFClient::UI::HBox::; 2788our @ISA = CFClient::UI::ScrolledWindow::;
2532
2533sub _item_to_desc {
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
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 2789
2559sub new { 2790sub new {
2560 my $class = shift; 2791 my $class = shift;
2561 2792
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 ( 2793 my $self = $class->SUPER::new (
2569 can_hover => 1, 2794 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
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 @_, 2795 @_,
2644 ); 2796 );
2645 2797
2646 $self 2798 $self
2647} 2799}
… …
2657 or ($a->{name} cmp $b->{name}) 2809 or ($a->{name} cmp $b->{name})
2658 } @$items; 2810 } @$items;
2659 2811
2660 $self->{real_items} = \@items; 2812 $self->{real_items} = \@items;
2661 2813
2814 my $row = 0;
2662 for my $item (@items) { 2815 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2816 CFClient::Item::update_widgets $item;
2664 $item->update_item ();
2665 }
2666 2817
2667 $self->{scrolled}->add (@items); 2818 $self->{scrolled}->add (0, $row, $item->{face_widget});
2819 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2820 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2668 2821
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2822 $row++;
2670} 2823 }
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675} 2824}
2676 2825
2677############################################################################# 2826#############################################################################
2678 2827
2679package CFClient::UI::Menu; 2828package CFClient::UI::Menu;
… …
2714 2863
2715# 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)
2716sub popup { 2865sub popup {
2717 my ($self, $ev) = @_; 2866 my ($self, $ev) = @_;
2718 2867
2719 $self->emit ("popdown"); 2868 $self->_emit ("popdown");
2720 2869
2721 # maybe save $GRAB? must be careful about events... 2870 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 2871 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 2872 $self->{button} = $ev->{button};
2724 2873
2725 $self->show; 2874 $self->show;
2726 $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);
2727} 2876}
2728 2877
2729sub mouse_motion { 2878sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_; 2879 my ($self, $ev, $x, $y) = @_;
2731 2880
… …
2739 2888
2740 if ($ev->{button} == $self->{button}) { 2889 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 2890 undef $GRAB;
2742 $self->hide; 2891 $self->hide;
2743 2892
2744 $self->emit ("popdown"); 2893 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 2894 $self->{hover}[1]->() if $self->{hover};
2746 } 2895 }
2747} 2896}
2748 2897
2749############################################################################# 2898#############################################################################
… …
2811sub add { 2960sub add {
2812 my ($self, $text, %arg) = @_; 2961 my ($self, $text, %arg) = @_;
2813 2962
2814 $text =~ s/^\s+//; 2963 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//; 2964 $text =~ s/\s+$//;
2965
2966 return unless $text;
2816 2967
2817 my $timeout = time + ((delete $arg{timeout}) || 60); 2968 my $timeout = time + ((delete $arg{timeout}) || 60);
2818 2969
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2970 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820 2971
… …
2863use CFClient::OpenGL; 3014use CFClient::OpenGL;
2864 3015
2865sub new { 3016sub new {
2866 my $class = shift; 3017 my $class = shift;
2867 3018
2868 $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
3020 visible => 1,
2869 @_, 3021 @_,
2870 ) 3022 );
2871}
2872 3023
2873sub configure { 3024 Scalar::Util::weaken ($self->{root} = $self);
2874 my ($self, $x, $y, $w, $h) = @_;
2875 3025
2876 $self->{w} = $w; 3026 $self
2877 $self->{h} = $h;
2878}
2879
2880sub check_size {
2881 my ($self) = @_;
2882
2883 $self->size_allocate ($self->{w}, $self->{h})
2884 if $self->{w};
2885} 3027}
2886 3028
2887sub size_request { 3029sub size_request {
2888 my ($self) = @_; 3030 my ($self) = @_;
2889 3031
2890 ($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
2891} 3047}
2892 3048
2893sub size_allocate { 3049sub size_allocate {
2894 my ($self, $w, $h) = @_; 3050 my ($self, $w, $h) = @_;
2895 3051
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) { 3052 for my $child ($self->children) {
2903 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)};
2904 3054
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3055 $X = $child->{force_x} if exists $child->{force_x};
2906 if exists $child->{req_x}; 3056 $Y = $child->{force_y} if exists $child->{force_y};
2907 3057
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3058 $X = _to_pixel $X, $W, $self->{w};
2909 if exists $child->{req_y}; 3059 $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 3060
2914 $child->configure ($X, $Y, $W, $H); 3061 $child->configure ($X, $Y, $W, $H);
2915 } 3062 }
2916} 3063}
2917 3064
… …
2928} 3075}
2929 3076
2930sub update { 3077sub update {
2931 my ($self) = @_; 3078 my ($self) = @_;
2932 3079
2933 $self->check_size;
2934 $::WANT_REFRESH++; 3080 $::WANT_REFRESH++;
2935} 3081}
2936 3082
2937sub add { 3083sub add {
2938 my ($self, @children) = @_; 3084 my ($self, @children) = @_;
2939 3085
2940 for my $child (@children) {
2941 $child->{toplevel} = 1; 3086 $_->{is_toplevel} = 1
2942 3087 for @children;
2943 # integerise window positions
2944 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y};
2946 }
2947 3088
2948 $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 }
2949} 3105}
2950 3106
2951sub on_refresh { 3107sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3108 my ($self, $id, $cb) = @_;
2953 3109
… …
2966 while ($self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
2967 $_->() 3123 $_->()
2968 for values %{delete $self->{refresh_hook}}; 3124 for values %{delete $self->{refresh_hook}};
2969 } 3125 }
2970 3126
2971 if ($self->{check_size}) { 3127 if ($self->{realloc}) {
2972 my @queue = ([], []); 3128 my @queue;
2973 3129
2974 for (;;) { 3130 while () {
2975 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
2976 # heuristic: check containers last 3132 #TODO use array-of-depth approach
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3133
2978 for values %{delete $self->{check_size}} 3134 use sort 'stable';
3135
3136 @queue = sort { $a->{visible} <=> $b->{visible} }
3137 @queue, values %{delete $self->{realloc}};
2979 } 3138 }
2980 3139
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3140 my $widget = pop @queue || last;
2982 3141
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3142 $widget->{visible} or last; # do not resize invisible widgets
2984 ? @$widget{qw(user_w user_h)} 3143
2985 : $widget->size_request; 3144 my ($w, $h) = $widget->size_request;
2986 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
2987 if (delete $widget->{force_alloc} 3153 || delete $widget->{force_realloc}) {
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
2991 $widget->{req_w} = $w; 3154 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h; 3155 $widget->{req_h} = $h;
2993 3156
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3157 $self->{size_alloc}{$widget+0} = $widget;
2995 3158
2996 $widget->{parent}->check_size
2997 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 }
2998 } 3165 }
3166
3167 delete $self->{realloc}{$widget+0};
2999 } 3168 }
3000 } 3169 }
3001 3170
3002 while ($self->{size_alloc}) { 3171 while (my $size_alloc = delete $self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) { 3172 my @queue = sort { $b->{visible} <=> $a->{visible} }
3004 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)};
3005 3179
3006 $w = 0 if $w < 0; 3180 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3181 $h = 0 if $h < 0;
3008 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}) {
3009 $widget->{w} = $w; 3187 $widget->{w} = $w;
3010 $widget->{h} = $h; 3188 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h); 3189
3012 $widget->emit (size_allocate => $w, $h); 3190 $widget->emit (size_allocate => $w, $h);
3191 }
3013 } 3192 }
3014 } 3193 }
3015 3194
3016 while ($self->{post_alloc_hook}) { 3195 while ($self->{post_alloc_hook}) {
3017 $_->() 3196 $_->()
3018 for values %{delete $self->{post_alloc_hook}}; 3197 for values %{delete $self->{post_alloc_hook}};
3019 } 3198 }
3020 3199
3200
3021 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3201 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3203 glClear GL_COLOR_BUFFER_BIT;
3024 3204
3025 glMatrixMode GL_PROJECTION; 3205 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3206 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3208 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3209 glLoadIdentity;
3030 3210
3031 $self->_draw; 3211 $self->_draw;
3032} 3212}
3033 3213
3034############################################################################# 3214#############################################################################
3035 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
3036package CFClient::UI; 3465package CFClient::UI;
3037 3466
3038$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
3039$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3040 3469

Diff Legend

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