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.266 by root, Thu Jun 1 03:42:58 2006 UTC

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

Diff Legend

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