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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.262 by elmex, Wed May 31 13:44:26 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
… …
717 840
718package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
719 842
720our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
721 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
722sub size_request { 855sub size_request {
723 my ($self) = @_; 856 my ($self) = @_;
724 857
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 859
728 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
729} 864}
730 865
731sub size_allocate { 866sub size_allocate {
732 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 875 $self->update;
735} 876}
736 877
737sub set_offset { 878sub set_offset {
738 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
789 my $class = shift; 930 my $class = shift;
790 931
791 my $self; 932 my $self;
792 933
793 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
794 vertical => 1, 935 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 937 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
798 }, 939 },
799 ; 940 ;
800 941
801 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 943 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 944 slider => $slider,
804 @_, 945 @_,
805 ); 946 );
806 947
807 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 949 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
810 951
811 $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]);
812} 972}
813 973
814#TODO# update range on size_allocate depending on child 974#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 975# update viewport offset on scroll
816 976
… …
860 1020
861our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
862 1022
863use CFClient::OpenGL; 1023use CFClient::OpenGL;
864 1024
865my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 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);
868 1032
869sub new { 1033sub new {
870 my $class = shift; 1034 my $class = shift;
871 1035
872 # TODO: user_x, user_y, overwrite moveto?
873
874 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1039 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
880 @_ 1043 @_
881 ); 1044 );
882 1045
883 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
884 align => 0, 1047 align => 0,
… …
937 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
938 1101
939 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
941 1104
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size;
946 }; 1110 };
947 1111
948 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1116 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
954 1118
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
956 1120
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update;
959 }; 1122 };
960 } 1123 }
961} 1124}
962 1125
963sub button_up { 1126sub button_up {
… …
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1146
984 my $border = $self->border; 1147 my $border = $self->border;
985 1148
986 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1154
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
994 1157
995 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1163 }
1006 1164
1007 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1008 1166
… …
1024sub new { 1182sub new {
1025 my $class = shift; 1183 my $class = shift;
1026 1184
1027 $class->SUPER::new ( 1185 $class->SUPER::new (
1028 col_expand => [], 1186 col_expand => [],
1029 @_ 1187 @_,
1030 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1193}
1032 1194
1033sub add { 1195sub add {
1034 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1035 1197
1036 $child->set_parent ($self); 1198 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1038 1200
1039 $child->check_size; 1201 $self->realloc;
1040} 1202}
1041 1203
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# 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?
1047sub clear { 1205sub clear {
1048 my ($self) = @_; 1206 my ($self) = @_;
1049 1207
1050 my @children = $self->children; 1208 my @children = $self->children;
1051 delete $self->{children}; 1209 delete $self->{children};
… …
1053 for (@children) { 1211 for (@children) {
1054 delete $_->{parent}; 1212 delete $_->{parent};
1055 $_->hide; 1213 $_->hide;
1056 } 1214 }
1057 1215
1058 $self->update; 1216 $self->realloc;
1059} 1217}
1060 1218
1061sub get_wh { 1219sub get_wh {
1062 my ($self) = @_; 1220 my ($self) = @_;
1063 1221
… …
1094sub size_allocate { 1252sub size_allocate {
1095 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1096 1254
1097 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1098 1256
1099 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1101 1259
1102 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1159 } 1317 }
1160} 1318}
1161 1319
1162############################################################################# 1320#############################################################################
1163 1321
1164package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1165
1166# TODO: wrap into common Box base class
1167 1323
1168our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1169 1325
1170sub size_request { 1326sub size_request {
1171 my ($self) = @_; 1327 my ($self) = @_;
1172 1328
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1174 1330 ? (
1175 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1176 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177 (List::Util::max map $_->[1], @alloc), 1333 )
1178 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1179} 1338}
1180 1339
1181sub size_allocate { 1340sub size_allocate {
1182 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1183 1342
1184 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1185
1186 my $children = $self->{children}; 1344 my $children = $self->{children};
1187 1345
1188 my @h = map $_->{req_w}, @$children; 1346 my @req;
1189 1347
1190 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1191 1349 @req = ($space / (@$children || 1)) x @$children;
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } 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 {
1196 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197 $exp ||= 1;
1198 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1199 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 } 1364 }
1206 } 1365 }
1207 1366
1208 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1209 1368
1210 my $y = 0; 1369 my $pos = 0;
1211 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1214 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215 1373
1216 $y += $h; 1374 $pos += $alloc;
1217 } 1375 }
1218 1376
1219 1 1377 1
1220} 1378}
1221 1379
1222############################################################################# 1380#############################################################################
1223 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
1224package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1225 1398
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1229 1400
1230sub size_request { 1401sub new {
1231 my ($self) = @_; 1402 my $class = shift;
1232 1403
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1234 1405 vertical => 1,
1235 ( 1406 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1407 )
1239}
1240
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278} 1408}
1279 1409
1280############################################################################# 1410#############################################################################
1281 1411
1282package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1429 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1301 fontsize => 1, 1431 fontsize => 1,
1302 align => -1, 1432 align => -1,
1303 valign => -1, 1433 valign => -1,
1304 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1305 can_events => 0, 1436 can_events => 0,
1306 %arg 1437 %arg
1307 ); 1438 );
1308 1439
1309 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1345 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1346 1477
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1349 1480
1481 $self->realloc;
1350 $self->update; 1482 $self->update;
1351 $self->check_size;
1352} 1483}
1353 1484
1354sub set_markup { 1485sub set_markup {
1355 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1356 1487
… …
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1492
1362 $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;
1363 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1364 1495
1496 $self->realloc;
1365 $self->update; 1497 $self->update;
1366 $self->check_size;
1367} 1498}
1368 1499
1369sub size_request { 1500sub size_request {
1370 my ($self) = @_; 1501 my ($self) = @_;
1371 1502
… …
1385 1516
1386 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1388 } 1519 }
1389 1520
1390 ( 1521 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1522}
1395 1523
1396sub size_allocate { 1524sub size_allocate {
1397 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1398 1526
… …
1403 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1404 1532
1405 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1534 delete $self->{texture};
1407 1535
1408 $self->update; 1536 $self->realloc;
1409 $self->check_size;
1410} 1537}
1411 1538
1412sub _draw { 1539sub _draw {
1413 my ($self) = @_; 1540 my ($self) = @_;
1414 1541
… …
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1551
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1426 1553
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1429 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1430 1557
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1433 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1434 1561
1435 $tex 1562 $tex
1436 }; 1563 };
1437 1564
… …
1466 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1467 can_hover => 1, 1594 can_hover => 1,
1468 can_focus => 1, 1595 can_focus => 1,
1469 valign => 0, 1596 valign => 0,
1470 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1471 @_ 1599 @_
1472 ) 1600 )
1473} 1601}
1474 1602
1475sub _set_text { 1603sub _set_text {
… …
1485 $self->{text} = $text; 1613 $self->{text} = $text;
1486 1614
1487 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1489 1617
1490 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1491} 1619}
1492 1620
1493sub set_text { 1621sub set_text {
1494 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1495 1623
1496 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1625 $self->_set_text ($text);
1498 $self->update; 1626
1499 $self->check_size; 1627 $self->realloc;
1500} 1628}
1501 1629
1502sub get_text { 1630sub get_text {
1503 $_[0]{text} 1631 $_[0]{text}
1504} 1632}
… …
1507 my ($self) = @_; 1635 my ($self) = @_;
1508 1636
1509 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1510 1638
1511 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1640}
1519 1641
1520sub key_down { 1642sub key_down {
1521 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1522 1644
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1663 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1664 $self->_emit ('escape');
1543 } elsif ($uni) { 1665 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1545 } 1667 }
1546 1668
1547 $self->_set_text ($text); 1669 $self->_set_text ($text);
1548 $self->update; 1670
1549 $self->check_size; 1671 $self->realloc;
1550} 1672}
1551 1673
1552sub focus_in { 1674sub focus_in {
1553 my ($self) = @_; 1675 my ($self) = @_;
1554 1676
… …
1634 if ($sym == 13) { 1756 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1640 $self->update; 1762 $self->update;
1641 1763
1642 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1681 1803
1682sub new { 1804sub new {
1683 my $class = shift; 1805 my $class = shift;
1684 1806
1685 $class->SUPER::new ( 1807 $class->SUPER::new (
1686 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1687 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1689 can_hover => 1, 1812 can_hover => 1,
1690 align => 0, 1813 align => 0,
1691 valign => 0, 1814 valign => 0,
1692 can_events => 1, 1815 can_events => 1,
1693 @_ 1816 @_
1694 ) 1817 )
1695} 1818}
1696 1819
1820sub activate { }
1821
1697sub button_up { 1822sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1699 1824
1825 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate");
1703 }
1704} 1828}
1705 1829
1706sub _draw { 1830sub _draw {
1707 my ($self) = @_; 1831 my ($self) = @_;
1708 1832
… …
1737 1861
1738sub new { 1862sub new {
1739 my $class = shift; 1863 my $class = shift;
1740 1864
1741 $class->SUPER::new ( 1865 $class->SUPER::new (
1742 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1743 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 1872 state => 0,
… …
1751} 1876}
1752 1877
1753sub size_request { 1878sub size_request {
1754 my ($self) = @_; 1879 my ($self) = @_;
1755 1880
1756 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1757} 1882}
1758 1883
1759sub button_down { 1884sub button_down {
1760 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1761 1886
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1766 } 1891 }
1767} 1892}
1768 1893
1769sub _draw { 1894sub _draw {
1770 my ($self) = @_; 1895 my ($self) = @_;
1771 1896
1772 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1773 1898
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 1900
1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1777 1904
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 1906
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 1908
… …
2045 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2053 vertical => 0, 2180 vertical => 0,
2054 can_hover => 1, 2181 can_hover => 1,
2055 inner_pad => .05, 2182 inner_pad => 0.02,
2056 @_ 2183 @_
2057 ); 2184 );
2058 2185
2059 $self->set_value ($self->{range}[0]); 2186 $self->set_value ($self->{range}[0]);
2060 $self->update; 2187 $self->update;
2061 2188
2062 $self 2189 $self
2063} 2190}
2064 2191
2192sub changed { }
2193
2194sub set_range {
2195 my ($self, $range) = @_;
2196
2197 ($range, $self->{range}) = ($self->{range}, $range);
2198
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2201}
2202
2065sub set_value { 2203sub set_value {
2066 my ($self, $value) = @_; 2204 my ($self, $value) = @_;
2067 2205
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2207
2070 $hi = $lo + 1 if $hi <= $lo; 2208 $hi = $lo + 1 if $hi <= $lo;
2071 2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2072 $value = $lo if $value < $lo; 2212 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2213 $value = $hi - $page if $value > $hi - $page;
2074 2214
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2216 if $unit;
2077 2217
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2219
2082 if ($value != $old_value) { 2220 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2221 $self->_emit (changed => $value);
2084 $self->update; 2222 $self->update;
2085 } 2223 }
2086} 2224}
2087 2225
2088sub size_request { 2226sub size_request {
2089 my ($self) = @_; 2227 my ($self) = @_;
2090 2228
2091 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2230}
2096 2231
2097sub button_down { 2232sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2099 2234
2100 $self->SUPER::button_down ($ev, $x, $y); 2235 $self->SUPER::button_down ($ev, $x, $y);
2236
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238
2101 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
2102} 2240}
2103 2241
2104sub mouse_motion { 2242sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2247
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2249
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2251
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2253 }
2116} 2254}
2117 2255
2118sub update { 2256sub update {
2119 my ($self) = @_; 2257 my ($self) = @_;
2120 2258
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2260 $self->set_value ($self->{range}[0]);
2123 2261
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
2125 2264
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2266
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2269
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2270 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2271 $value = $value * $self->{scale} + $self->{offset};
2132 2272
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2273 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2274 $self->{knob_w} = $knob_w;
2140 }); 2275 });
2141 2276
2142 $self->SUPER::update; 2277 $self->SUPER::update;
2143} 2278}
2144 2279
… …
2168 # draw handle 2303 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2305
2171 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2172} 2307}
2308
2309#############################################################################
2310
2311package CFClient::UI::ValSlider;
2312
2313our @ISA = CFClient::UI::HBox::;
2314
2315sub new {
2316 my ($class, %arg) = @_;
2317
2318 my $range = delete $arg{range};
2319
2320 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift },
2324 from_value => sub { shift },
2325 %arg,
2326 );
2327
2328 $self->{slider}->connect (changed => sub {
2329 my ($self, $value) = @_;
2330 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2331 $self->{parent}->emit (changed => $value);
2332 });
2333
2334# $self->{entry}->connect (changed => sub {
2335# my ($self, $value) = @_;
2336# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2337# $self->{parent}->emit (changed => $value);
2338# });
2339
2340 $self->add ($self->{slider}, $self->{entry});
2341
2342 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2343
2344 $self
2345}
2346
2347sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) }
2173 2349
2174############################################################################# 2350#############################################################################
2175 2351
2176package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2177 2353
… …
2207 2383
2208 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2385 $self->reflow;
2210} 2386}
2211 2387
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2388sub size_allocate {
2232 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2233 2390
2234 $self->SUPER::size_allocate ($w, $h); 2391 $self->SUPER::size_allocate ($w, $h);
2235 2392
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2396
2240 $self->reflow; 2397 $self->reflow;
2241} 2398}
2242 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
2243sub add_paragraph { 2434sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2245 2436
2246 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2247 2438 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2251 2442
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255 $self->{children}[1]->update;
2256} 2444}
2257 2445
2258sub update { 2446sub update {
2259 my ($self) = @_; 2447 my ($self) = @_;
2260 2448
… …
2263 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2264 2452
2265 delete $self->{texture}; 2453 delete $self->{texture};
2266 2454
2267 $ROOT->on_post_alloc ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2268 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2459 my $height = 0;
2270 2460
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2272 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2273 2476
2274 $self->{height} = $height; 2477 $self->{height} = $height;
2275 2478
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2480
2278 delete $self->{texture}; 2481 delete $self->{texture};
2279 } 2482 }
2280 2483
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2284 2487
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2488 my $top = int $self->{children}[1]{range}[0];
2289 2489
2290 my $y0 = $top; 2490 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2491 my $y1 = $top + $H;
2292 2492
2293 my $y = 0; 2493 my $y = 0;
2294 2494
2295 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2296 2496
2297 $layout->set_font ($self->{font}) if $self->{font}; 2497 $layout->set_font ($self->{font}) if $self->{font};
2298 2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2299 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2504 my $h = $par->[1];
2301 2505
2302 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2305 2510
2306 my ($W, $H) = $layout->size; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2512
2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2515 }
2309 2516
2310 $y += $h; 2517 $y += $h;
2311 } 2518 }
2312 2519
2313 glDisable GL_TEXTURE_2D; 2520 glDisable GL_BLEND;
2314 }; 2521 };
2315 }); 2522 });
2316} 2523}
2317 2524
2318sub _draw { 2525sub _draw {
… …
2378 2585
2379sub new { 2586sub new {
2380 my $class = shift; 2587 my $class = shift;
2381 2588
2382 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2383 state => 0, 2590 state => 0,
2384 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2385 @_ 2592 @_
2386 ); 2593 );
2387 2594
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2595 $self
2394} 2596}
2395 2597
2396sub toggle_flopper { 2598sub toggle_flopper {
2397 my ($self) = @_; 2599 my ($self) = @_;
2398 2600
2399 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2602}
2411 2603
2412############################################################################# 2604#############################################################################
2413 2605
2414package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2427} 2619}
2428 2620
2429sub set_tooltip_from { 2621sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2431 2623
2624 my $tooltip = $widget->{tooltip};
2625
2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2432 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2636 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2638 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2449 2650
2450sub size_allocate { 2651sub size_allocate {
2451 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2452 2653
2453 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2454} 2673}
2455 2674
2456sub _draw { 2675sub _draw {
2457 my ($self) = @_; 2676 my ($self) = @_;
2458 2677
… …
2475 glVertex $w, $h; 2694 glVertex $w, $h;
2476 glVertex $w, 0; 2695 glVertex $w, 0;
2477 glEnd; 2696 glEnd;
2478 2697
2479 glTranslate 2 - 0.375, 2 - 0.375; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2480 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2481} 2701}
2482 2702
2483############################################################################# 2703#############################################################################
2484 2704
… …
2489use CFClient::OpenGL; 2709use CFClient::OpenGL;
2490 2710
2491sub new { 2711sub new {
2492 my $class = shift; 2712 my $class = shift;
2493 2713
2494 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2495 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2496 @_, 2717 @_,
2497 ) 2718 );
2719
2720 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self);
2722
2723 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1,
2726 interval => $self->{animspeed},
2727 cb => sub {
2728 ++$widget->{frame};
2729 $widget->update;
2730 },
2731 );
2732 }
2733
2734 $self
2498} 2735}
2499 2736
2500sub size_request { 2737sub size_request {
2501 (32, 8) 2738 (32, 8)
2502} 2739}
2503 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2504sub _draw { 2749sub _draw {
2505 my ($self) = @_; 2750 my ($self) = @_;
2506 2751
2507 return unless $::CONN;#d# manage and cache textures differently 2752 return unless $::CONN;
2753
2754 my $face;
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2764
2510 # TODO animation
2511 if ($tex) { 2765 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2517 } 2771 }
2518} 2772}
2519 2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2781}
2782
2520############################################################################# 2783#############################################################################
2521 2784
2522package CFClient::UI::InventoryItem; 2785package CFClient::UI::Inventory;
2523 2786
2524our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551 2788
2552sub new { 2789sub new {
2553 my $class = shift; 2790 my $class = shift;
2554 2791
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new ( 2792 my $self = $class->SUPER::new (
2562 can_hover => 1, 2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_, 2794 @_,
2637 ); 2795 );
2638 2796
2639 $self 2797 $self
2640} 2798}
… …
2650 or ($a->{name} cmp $b->{name}) 2808 or ($a->{name} cmp $b->{name})
2651 } @$items; 2809 } @$items;
2652 2810
2653 $self->{real_items} = \@items; 2811 $self->{real_items} = \@items;
2654 2812
2813 my $row = 0;
2655 for my $item (@items) { 2814 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2815 CFClient::Item::update_widgets $item;
2657 $item->update_item ();
2658 }
2659 2816
2660 $self->{scrolled}->add (@items); 2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2661 2820
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2821 $row++;
2663} 2822 }
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668} 2823}
2669 2824
2670############################################################################# 2825#############################################################################
2671 2826
2672package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
… …
2707 2862
2708# popup given the event (must be a mouse button down event currently) 2863# popup given the event (must be a mouse button down event currently)
2709sub popup { 2864sub popup {
2710 my ($self, $ev) = @_; 2865 my ($self, $ev) = @_;
2711 2866
2712 $self->emit ("popdown"); 2867 $self->_emit ("popdown");
2713 2868
2714 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 2870 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2717 2872
2718 $self->show; 2873 $self->show;
2719 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720} 2875}
2721 2876
2722sub mouse_motion { 2877sub mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2724 2879
… …
2732 2887
2733 if ($ev->{button} == $self->{button}) { 2888 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 2889 undef $GRAB;
2735 $self->hide; 2890 $self->hide;
2736 2891
2737 $self->emit ("popdown"); 2892 $self->_emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 2893 $self->{hover}[1]->() if $self->{hover};
2739 } 2894 }
2740} 2895}
2741 2896
2742############################################################################# 2897#############################################################################
… …
2804sub add { 2959sub add {
2805 my ($self, $text, %arg) = @_; 2960 my ($self, $text, %arg) = @_;
2806 2961
2807 $text =~ s/^\s+//; 2962 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2809 2966
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2968
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2970
… …
2856use CFClient::OpenGL; 3013use CFClient::OpenGL;
2857 3014
2858sub new { 3015sub new {
2859 my $class = shift; 3016 my $class = shift;
2860 3017
2861 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
3019 visible => 1,
2862 @_, 3020 @_,
2863 ) 3021 );
2864}
2865 3022
2866sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
2867 my ($self, $x, $y, $w, $h) = @_;
2868 3024
2869 $self->{w} = $w; 3025 $self
2870 $self->{h} = $h;
2871}
2872
2873sub check_size {
2874 my ($self) = @_;
2875
2876 $self->size_allocate ($self->{w}, $self->{h})
2877 if $self->{w};
2878} 3026}
2879 3027
2880sub size_request { 3028sub size_request {
2881 my ($self) = @_; 3029 my ($self) = @_;
2882 3030
2883 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
2884} 3046}
2885 3047
2886sub size_allocate { 3048sub size_allocate {
2887 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2888 3050
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2895 for my $child ($self->children) { 3051 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 3053
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
2900 3056
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 3059
2907 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
2908 } 3061 }
2909} 3062}
2910 3063
… …
2921} 3074}
2922 3075
2923sub update { 3076sub update {
2924 my ($self) = @_; 3077 my ($self) = @_;
2925 3078
2926 $self->check_size;
2927 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
2928} 3080}
2929 3081
2930sub add { 3082sub add {
2931 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
2932 3084
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 3085 $_->{is_toplevel} = 1
2935 3086 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 3087
2941 $self->SUPER::add (@children); 3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2942} 3104}
2943 3105
2944sub on_refresh { 3106sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2946 3108
… …
2959 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2960 $_->() 3122 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
2962 } 3124 }
2963 3125
2964 if ($self->{check_size}) { 3126 if ($self->{realloc}) {
2965 my @queue = ([], []); 3127 my @queue;
2966 3128
2967 for (;;) { 3129 while () {
2968 if ($self->{check_size}) { 3130 if ($self->{realloc}) {
2969 # heuristic: check containers last 3131 #TODO use array-of-depth approach
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
2971 for values %{delete $self->{check_size}} 3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
2972 } 3137 }
2973 3138
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3139 my $widget = pop @queue || last;
2975 3140
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 $widget->{visible} or last; # do not resize invisible widgets
2977 ? @$widget{qw(user_w user_h)} 3142
2978 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
2979 3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
2980 if (delete $widget->{force_alloc} 3152 || delete $widget->{force_realloc}) {
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983
2984 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
2986 3155
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3156 $self->{size_alloc}{$widget+0} = $widget;
2988 3157
2989 $widget->{parent}->check_size
2990 if $widget->{parent}; 3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
2991 } 3164 }
3165
3166 delete $self->{realloc}{$widget+0};
2992 } 3167 }
2993 } 3168 }
2994 3169
2995 while ($self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
2997 my ($widget, $w, $h) = @$_; 3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2998 3178
2999 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3001 3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3002 $widget->{w} = $w; 3186 $widget->{w} = $w;
3003 $widget->{h} = $h; 3187 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 3188
3005 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3006 } 3191 }
3007 } 3192 }
3008 3193
3009 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3010 $_->() 3195 $_->()
3011 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3012 } 3197 }
3013 3198
3199
3014 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3017 3203
3018 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3205 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3208 glLoadIdentity;
3023 3209
3024 $self->_draw; 3210 $self->_draw;
3025} 3211}
3026 3212
3027############################################################################# 3213#############################################################################
3028 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315# if $commit is true, the binding will be set after the user entered a key combo
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Button
3392 text => "delete",
3393 tooltip => "Deletes the action from the record",
3394 on_activate => sub {
3395 $self->{cmdbox}->remove ($hb);
3396 $cmds->[$i] = undef;
3397 });
3398
3399 $hb->add (new CFClient::UI::Label text => $_);
3400
3401 $idx++
3402 }
3403}
3404
3405
3406#############################################################################
3407
3408package CFClient::UI::SpellList;
3409
3410our @ISA = CFClient::UI::FancyFrame::;
3411
3412sub new {
3413 my $class = shift;
3414
3415 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3416
3417 $self->add (new CFClient::UI::ScrolledWindow
3418 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3419
3420 $self;
3421}
3422
3423# XXX: Do sorting? Argl...
3424sub add_spell {
3425 my ($self, $spell) = @_;
3426 $self->{spells}->{$spell->{name}} = $spell;
3427
3428 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429 face => $spell->{face},
3430 can_hover => 1,
3431 can_events => 1,
3432 tooltip => $spell->{message});
3433
3434 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435 text => $spell->{name},
3436 can_hover => 1,
3437 can_events => 1,
3438 tooltip => $spell->{message},
3439 expand => 1);
3440 $self->{spellbox}->add (2, $self->{tbl_idx}++, new CFClient::UI::Button
3441 text => "bind to key",
3442 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3443}
3444
3445sub rebuild_spell_list {
3446 my ($self) = @_;
3447 $self->{tbl_idx} = 0;
3448 $self->add_spell ($_) for values %{$self->{spells}};
3449}
3450
3451sub remove_spell {
3452 my ($self, $spell) = @_;
3453 delete $self->{spells}->{$spell->{name}};
3454 $self->rebuild_spell_list;
3455}
3456
3457#############################################################################
3458
3029package CFClient::UI; 3459package CFClient::UI;
3030 3460
3031$ROOT = new CFClient::UI::Root; 3461$ROOT = new CFClient::UI::Root;
3032$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3462$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3033 3463

Diff Legend

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