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.268 by root, Thu Jun 1 05:04:41 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
158 } 189 }
159
160 $widget->reconfigure;
161 } 190 }
191
192 reconfigure_widgets;
162} 193}
163 194
164############################################################################# 195#############################################################################
165 196
166package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
171 202
172sub new { 203sub new {
173 my $class = shift; 204 my $class = shift;
174 205
175 my $self = bless { 206 my $self = bless {
176 x => 0, 207 x => "center",
177 y => 0, 208 y => "center",
178 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
179 can_events => 1, 212 can_events => 1,
180 @_ 213 @_
181 }, $class; 214 }, $class;
182 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
183 for (keys %$self) { 218 for (keys %$self) {
184 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
186 } 221 }
187 } 222 }
188 223
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
190 235
191 $self 236 $self
192} 237}
193 238
194sub destroy { 239sub destroy {
… …
204 return if $self->{parent}; 249 return if $self->{parent};
205 250
206 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
207} 252}
208 253
209sub hide { 254sub set_visible {
210 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
211 278
212 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
214 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
215 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
216 if $self->{parent}; 313 if $self->{parent};
217} 314}
218 315
219sub move { 316sub move_abs {
220 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
221 318
222 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
225 322
226 $self->update; 323 $self->update;
227} 324}
228 325
229sub set_size { 326sub set_size {
230 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
231 328
232 $self->{user_w} = $w; 329 $self->{force_w} = $w;
233 $self->{user_h} = $h; 330 $self->{force_h} = $h;
234 331
235 $self->check_size; 332 $self->realloc;
236} 333}
237 334
238sub size_request { 335sub size_request {
239 require Carp; 336 require Carp;
240 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
242 339
243sub configure { 340sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
245 342
246 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
249 348
250 # use alignment to adjust x, y 349 # use alignment to adjust x, y
251 350
252 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 353 }
257 354
258 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 356 $self->{x} = $x;
260 $self->{y} = $y; 357 $self->{y} = $y;
261 $self->update; 358 $self->update;
262 } 359 }
263 360
264 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
266 } 368 }
267} 369}
268 370
269sub size_allocate { 371sub size_allocate {
270 # nothing to be done 372 # nothing to be done
271} 373}
272 374
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 375sub children {
281} 376}
282 377
283sub set_max_size { 378sub set_max_size {
284 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 383}
289 384
290sub set_tooltip { 385sub set_tooltip {
291 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
292 392
293 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
294 394
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 418 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
320 420
321 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
322 422
323 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
324 424
325 $focus->update if $focus; 425 $focus->update if $focus;
326 $FOCUS->update; 426 $FOCUS->update;
327} 427}
328 428
… …
331 431
332 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
333 433
334 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
335 435
336 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
337 437
338 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
339} 442}
340 443
341sub mouse_motion { } 444sub mouse_motion { }
342sub button_up { } 445sub button_up { }
343sub key_down { } 446sub key_down { }
344sub key_up { } 447sub key_up { }
345 448
346sub button_down { 449sub button_down {
347 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
348 451
349 $self->focus_in; 452 $self->focus_in;
350} 453}
351 454
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
356sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
357 528
358sub draw { 529sub draw {
359 my ($self) = @_; 530 my ($self) = @_;
360 531
361 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539
540 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
362 543
363 glPushMatrix; 544 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw; 546 $self->_draw;
366 glPopMatrix; 547 glPopMatrix;
… …
378 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
379 glEnd; 560 glEnd;
380 glDisable GL_BLEND; 561 glDisable GL_BLEND;
381 } 562 }
382 563
383 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
384 glPushMatrix; 565 glPushMatrix;
385 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 569 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
392 glEnd; 573 glEnd;
393 glPopMatrix; 574 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 } 576 }
396} 577}
397 578
398sub _draw { 579sub _draw {
399 my ($self) = @_; 580 my ($self) = @_;
400 581
401 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
402}
403
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450} 583}
451 584
452sub DESTROY { 585sub DESTROY {
453 my ($self) = @_; 586 my ($self) = @_;
454 587
… …
512 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
514} 647}
515 648
516sub size_request { 649sub size_request {
517 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
518} 653}
519 654
520sub draw { } 655sub draw { }
521 656
522############################################################################# 657#############################################################################
… …
551 $self->{children} = [ 686 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 688 @{$self->{children}}, @widgets
554 ]; 689 ];
555 690
556 $self->check_size (1); 691 $self->realloc;
557 $self->update;
558} 692}
559 693
560sub children { 694sub children {
561 @{ $_[0]{children} } 695 @{ $_[0]{children} }
562} 696}
… …
567 delete $child->{parent}; 701 delete $child->{parent};
568 $child->hide; 702 $child->hide;
569 703
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 705
572 $self->check_size; 706 $self->realloc;
573 $self->update;
574} 707}
575 708
576sub clear { 709sub clear {
577 my ($self) = @_; 710 my ($self) = @_;
578 711
… …
582 for (@$children) { 715 for (@$children) {
583 delete $_->{parent}; 716 delete $_->{parent};
584 $_->hide; 717 $_->hide;
585 } 718 }
586 719
587 $self->check_size; 720 $self->realloc;
588 $self->update;
589} 721}
590 722
591sub find_widget { 723sub find_widget {
592 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
593 725
… …
680 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 813 $self->update;
682} 814}
683 815
684sub _render { 816sub _render {
817 my ($self) = @_;
818
685 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
686} 820}
687 821
688sub render_child { 822sub render_child {
689 my ($self) = @_; 823 my ($self) = @_;
690 824
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
694 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
695 $self->_render; 836 $self->_render;
696 }; 837 };
697} 838}
698 839
699sub _draw { 840sub _draw {
700 my ($self) = @_; 841 my ($self) = @_;
701 842
702 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
703 844
704 my $tex = $self->{texture} 845 my $tex = $self->{texture}
705 or return; 846 or return;
706 847
707 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
… …
717 858
718package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
719 860
720our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
721 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
722sub size_request { 873sub size_request {
723 my ($self) = @_; 874 my ($self) = @_;
724 875
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 877
728 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
729} 882}
730 883
731sub size_allocate { 884sub size_allocate {
732 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
733 886
887 my $child = $self->child;
888
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891
892 $self->child->configure (0, 0, $w, $h);
734 $self->update; 893 $self->update;
735} 894}
736 895
737sub set_offset { 896sub set_offset {
738 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
… …
772} 931}
773 932
774sub _render { 933sub _render {
775 my ($self) = @_; 934 my ($self) = @_;
776 935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
938
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 940
779 $self->SUPER::_render; 941 $self->SUPER::_render;
780} 942}
781 943
… …
789 my $class = shift; 951 my $class = shift;
790 952
791 my $self; 953 my $self;
792 954
793 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
794 vertical => 1, 956 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 958 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
798 }, 960 },
799 ; 961 ;
800 962
801 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 964 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 965 slider => $slider,
804 @_, 966 @_,
805 ); 967 );
806 968
807 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 970 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
810 972
811 $self 973 $self
974}
975
976sub update {
977 my ($self) = @_;
978
979 $self->SUPER::update;
980
981 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984}
985
986sub size_allocate {
987 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
812} 993}
813 994
814#TODO# update range on size_allocate depending on child 995#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 996# update viewport offset on scroll
816 997
… …
860 1041
861our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
862 1043
863use CFClient::OpenGL; 1044use CFClient::OpenGL;
864 1045
865my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 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); 1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868 1053
869sub new { 1054sub new {
870 my $class = shift; 1055 my $class = shift;
871 1056
872 # TODO: user_x, user_y, overwrite moveto?
873
874 my $self = $class->SUPER::new ( 1057 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1058 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1059 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1060 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1061 can_events => 1,
1062 min_w => 16,
1063 min_h => 16,
880 @_ 1064 @_
881 ); 1065 );
882 1066
883 $self->{title} &&= new CFClient::UI::Label 1067 $self->{title} &&= new CFClient::UI::Label
884 align => 0, 1068 align => 0,
… …
937 my ($ev, $x, $y) = @_; 1121 my ($ev, $x, $y) = @_;
938 1122
939 my $dx = $ev->{x} - $ox; 1123 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1124 my $dy = $ev->{y} - $oy;
941 1125
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128
1129 $self->realloc;
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size;
946 }; 1131 };
947 1132
948 } elsif ($lr ^ $td) { 1133 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1134 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1135 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1137 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1138 my ($ev, $x, $y) = @_;
954 1139
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1140 ($x, $y) = ($ev->{x}, $ev->{y});
956 1141
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update;
959 }; 1143 };
960 } 1144 }
961} 1145}
962 1146
963sub button_up { 1147sub button_up {
… …
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1167
984 my $border = $self->border; 1168 my $border = $self->border;
985 1169
986 glColor @{ $self->{border_bg} }; 1170 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1171 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1172 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1173 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1174 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1175
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1176 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1177 glColor @{ $self->{bg} };
994 1178
995 # TODO: repeat texture not scale 1179 # TODO: repeat texture not scale
1180 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1181 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1182 $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); 1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1184 }
1006 1185
1007 glDisable GL_TEXTURE_2D; 1186 glDisable GL_TEXTURE_2D;
1008 1187
… …
1024sub new { 1203sub new {
1025 my $class = shift; 1204 my $class = shift;
1026 1205
1027 $class->SUPER::new ( 1206 $class->SUPER::new (
1028 col_expand => [], 1207 col_expand => [],
1029 @_ 1208 @_,
1030 ) 1209 )
1210}
1211
1212sub children {
1213 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1214}
1032 1215
1033sub add { 1216sub add {
1034 my ($self, $x, $y, $child) = @_; 1217 my ($self, $x, $y, $child) = @_;
1035 1218
1036 $child->set_parent ($self); 1219 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1220 $self->{children}[$y][$x] = $child;
1038 1221
1039 $child->check_size; 1222 $self->realloc;
1040} 1223}
1041 1224
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# TODO: move to container class maybe? send childs a signal on removal? 1225# TODO: move to container class maybe? send children a signal on removal?
1047sub clear { 1226sub clear {
1048 my ($self) = @_; 1227 my ($self) = @_;
1049 1228
1050 my @children = $self->children; 1229 my @children = $self->children;
1051 delete $self->{children}; 1230 delete $self->{children};
… …
1053 for (@children) { 1232 for (@children) {
1054 delete $_->{parent}; 1233 delete $_->{parent};
1055 $_->hide; 1234 $_->hide;
1056 } 1235 }
1057 1236
1058 $self->update; 1237 $self->realloc;
1059} 1238}
1060 1239
1061sub get_wh { 1240sub get_wh {
1062 my ($self) = @_; 1241 my ($self) = @_;
1063 1242
… …
1094sub size_allocate { 1273sub size_allocate {
1095 my ($self, $w, $h) = @_; 1274 my ($self, $w, $h) = @_;
1096 1275
1097 my ($ws, $hs) = $self->get_wh; 1276 my ($ws, $hs) = $self->get_wh;
1098 1277
1099 my $req_w = sum @$ws; 1278 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1279 my $req_h = (sum @$hs) || 1;
1101 1280
1102 # TODO: nicer code && do row_expand 1281 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1282 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1283 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1284 my $col_expand = (sum @col_expand) || 1;
… …
1159 } 1338 }
1160} 1339}
1161 1340
1162############################################################################# 1341#############################################################################
1163 1342
1164package CFClient::UI::HBox; 1343package CFClient::UI::Box;
1165
1166# TODO: wrap into common Box base class
1167 1344
1168our @ISA = CFClient::UI::Container::; 1345our @ISA = CFClient::UI::Container::;
1169 1346
1170sub size_request { 1347sub size_request {
1171 my ($self) = @_; 1348 my ($self) = @_;
1172 1349
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1350 $self->{vertical}
1174 1351 ? (
1175 ( 1352 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1176 (List::Util::sum map $_->[0], @alloc), 1353 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177 (List::Util::max map $_->[1], @alloc), 1354 )
1178 ) 1355 : (
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1358 )
1179} 1359}
1180 1360
1181sub size_allocate { 1361sub size_allocate {
1182 my ($self, $w, $h) = @_; 1362 my ($self, $w, $h) = @_;
1183 1363
1184 ($h, $w) = ($w, $h); 1364 my $space = $self->{vertical} ? $h : $w;
1185
1186 my $children = $self->{children}; 1365 my $children = $self->{children};
1187 1366
1188 my @h = map $_->{req_w}, @$children; 1367 my @req;
1189 1368
1190 my $req_h = List::Util::sum @h; 1369 if ($self->{homogeneous}) {
1191 1370 @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 { 1371 } else {
1372 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1373 my $req = List::Util::sum @req;
1374
1375 if ($req > $space) {
1376 # ah well, not enough space
1377 $_ *= $space / $req for @req;
1378 } else {
1196 my $exp = List::Util::sum map $_->{expand}, @$children; 1379 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197 $exp ||= 1;
1198 1380
1381 $space = ($space - $req) / $expand; # remaining space to give away
1382
1383 $req[$_] += $space * $children->[$_]{expand}
1199 for (0 .. $#$children) { 1384 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 } 1385 }
1206 } 1386 }
1207 1387
1208 CFClient::UI::harmonize \@h; 1388 CFClient::UI::harmonize \@req;
1209 1389
1210 my $y = 0; 1390 my $pos = 0;
1211 for (0 .. $#$children) { 1391 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_]; 1392 my $alloc = $req[$_];
1214 $child->configure ($y, 0, $h, $w); 1393 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215 1394
1216 $y += $h; 1395 $pos += $alloc;
1217 } 1396 }
1218 1397
1219 1 1398 1
1220} 1399}
1221 1400
1222############################################################################# 1401#############################################################################
1223 1402
1403package CFClient::UI::HBox;
1404
1405our @ISA = CFClient::UI::Box::;
1406
1407sub new {
1408 my $class = shift;
1409
1410 $class->SUPER::new (
1411 vertical => 0,
1412 @_,
1413 )
1414}
1415
1416#############################################################################
1417
1224package CFClient::UI::VBox; 1418package CFClient::UI::VBox;
1225 1419
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1420our @ISA = CFClient::UI::Box::;
1229 1421
1230sub size_request { 1422sub new {
1231 my ($self) = @_; 1423 my $class = shift;
1232 1424
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1425 $class->SUPER::new (
1234 1426 vertical => 1,
1235 ( 1427 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1428 )
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} 1429}
1279 1430
1280############################################################################# 1431#############################################################################
1281 1432
1282package CFClient::UI::Label; 1433package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1450 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1451 layout => (new CFClient::Layout),
1301 fontsize => 1, 1452 fontsize => 1,
1302 align => -1, 1453 align => -1,
1303 valign => -1, 1454 valign => -1,
1304 padding => 2, 1455 padding_x => 2,
1456 padding_y => 2,
1305 can_events => 0, 1457 can_events => 0,
1306 %arg 1458 %arg
1307 ); 1459 );
1308 1460
1309 if (exists $self->{template}) { 1461 if (exists $self->{template}) {
… …
1345 $self->{text} = "T$text"; 1497 $self->{text} = "T$text";
1346 1498
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1500 $self->{layout}->set_text ($text);
1349 1501
1502 $self->realloc;
1350 $self->update; 1503 $self->update;
1351 $self->check_size;
1352} 1504}
1353 1505
1354sub set_markup { 1506sub set_markup {
1355 my ($self, $markup) = @_; 1507 my ($self, $markup) = @_;
1356 1508
… …
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1512 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1513
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1514 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363 $self->{layout}->set_markup ($markup); 1515 $self->{layout}->set_markup ($markup);
1364 1516
1517 $self->realloc;
1365 $self->update; 1518 $self->update;
1366 $self->check_size;
1367} 1519}
1368 1520
1369sub size_request { 1521sub size_request {
1370 my ($self) = @_; 1522 my ($self) = @_;
1371 1523
… …
1385 1537
1386 $w = List::Util::max $w, $w2; 1538 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1539 $h = List::Util::max $h, $h2;
1388 } 1540 }
1389 1541
1390 ( 1542 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1543}
1395 1544
1396sub size_allocate { 1545sub size_allocate {
1397 my ($self, $w, $h) = @_; 1546 my ($self, $w, $h) = @_;
1398 1547
1399 delete $self->{texture}; 1548 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1550}
1401 1551
1402sub set_fontsize { 1552sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1553 my ($self, $fontsize) = @_;
1404 1554
1405 $self->{fontsize} = $fontsize; 1555 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1556 delete $self->{texture};
1407 1557
1408 $self->update; 1558 $self->realloc;
1409 $self->check_size;
1410} 1559}
1411 1560
1412sub _draw { 1561sub _draw {
1413 my ($self) = @_; 1562 my ($self) = @_;
1414 1563
… …
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1573
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1574 my $tex = new_from_layout CFClient::Texture $self->{layout};
1426 1575
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1429 : ($self->{w} - $tex->{w}) * 0.5); 1578 : ($self->{w} - $tex->{w}) * 0.5);
1430 1579
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1433 : ($self->{h} - $tex->{h}) * 0.5); 1582 : ($self->{h} - $tex->{h}) * 0.5);
1434 1583
1435 $tex 1584 $tex
1436 }; 1585 };
1437 1586
… …
1466 active_fg => [0, 0, 0], 1615 active_fg => [0, 0, 0],
1467 can_hover => 1, 1616 can_hover => 1,
1468 can_focus => 1, 1617 can_focus => 1,
1469 valign => 0, 1618 valign => 0,
1470 can_events => 1, 1619 can_events => 1,
1620 #text => ...
1471 @_ 1621 @_
1472 ) 1622 )
1473} 1623}
1474 1624
1475sub _set_text { 1625sub _set_text {
… …
1485 $self->{text} = $text; 1635 $self->{text} = $text;
1486 1636
1487 $text =~ s/./*/g if $self->{hidden}; 1637 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1638 $self->{layout}->set_text ("$text ");
1489 1639
1490 $self->emit (changed => $self->{text}); 1640 $self->_emit (changed => $self->{text});
1491} 1641}
1492 1642
1493sub set_text { 1643sub set_text {
1494 my ($self, $text) = @_; 1644 my ($self, $text) = @_;
1495 1645
1496 $self->{cursor} = length $text; 1646 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1647 $self->_set_text ($text);
1498 $self->update; 1648
1499 $self->check_size; 1649 $self->realloc;
1500} 1650}
1501 1651
1502sub get_text { 1652sub get_text {
1503 $_[0]{text} 1653 $_[0]{text}
1504} 1654}
… …
1507 my ($self) = @_; 1657 my ($self) = @_;
1508 1658
1509 my ($w, $h) = $self->SUPER::size_request; 1659 my ($w, $h) = $self->SUPER::size_request;
1510 1660
1511 ($w + 1, $h) # add 1 for cursor 1661 ($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} 1662}
1519 1663
1520sub key_down { 1664sub key_down {
1521 my ($self, $ev) = @_; 1665 my ($self, $ev) = @_;
1522 1666
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1681 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1682 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1683 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1684 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1685 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1686 $self->_emit ('escape');
1543 } elsif ($uni) { 1687 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1688 substr $text, $self->{cursor}++, 0, chr $uni;
1545 } 1689 }
1546 1690
1547 $self->_set_text ($text); 1691 $self->_set_text ($text);
1548 $self->update; 1692
1549 $self->check_size; 1693 $self->realloc;
1550} 1694}
1551 1695
1552sub focus_in { 1696sub focus_in {
1553 my ($self) = @_; 1697 my ($self) = @_;
1554 1698
… …
1634 if ($sym == 13) { 1778 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1779 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1780 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1781 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1782 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1783 $self->_emit (activate => $txt);
1640 $self->update; 1784 $self->update;
1641 1785
1642 } elsif ($sym == CFClient::SDLK_UP) { 1786 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1787 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1788 $self->{history_saveback} = $self->get_text;
… …
1681 1825
1682sub new { 1826sub new {
1683 my $class = shift; 1827 my $class = shift;
1684 1828
1685 $class->SUPER::new ( 1829 $class->SUPER::new (
1686 padding => 4, 1830 padding_x => 4,
1831 padding_y => 4,
1687 fg => [1, 1, 1], 1832 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1833 active_fg => [0, 0, 1],
1689 can_hover => 1, 1834 can_hover => 1,
1690 align => 0, 1835 align => 0,
1691 valign => 0, 1836 valign => 0,
1692 can_events => 1, 1837 can_events => 1,
1693 @_ 1838 @_
1694 ) 1839 )
1695} 1840}
1696 1841
1842sub activate { }
1843
1697sub button_up { 1844sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1699 1846
1847 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1848 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1849 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate");
1703 }
1704} 1850}
1705 1851
1706sub _draw { 1852sub _draw {
1707 my ($self) = @_; 1853 my ($self) = @_;
1708 1854
… …
1737 1883
1738sub new { 1884sub new {
1739 my $class = shift; 1885 my $class = shift;
1740 1886
1741 $class->SUPER::new ( 1887 $class->SUPER::new (
1742 padding => 2, 1888 padding_x => 2,
1889 padding_y => 2,
1743 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 1891 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 1892 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 1893 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 1894 state => 0,
… …
1751} 1898}
1752 1899
1753sub size_request { 1900sub size_request {
1754 my ($self) = @_; 1901 my ($self) = @_;
1755 1902
1756 ($self->{padding} * 2 + 6) x 2 1903 (6) x 2
1757} 1904}
1758 1905
1759sub button_down { 1906sub button_down {
1760 my ($self, $ev, $x, $y) = @_; 1907 my ($self, $ev, $x, $y) = @_;
1761 1908
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 1911 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1912 $self->_emit (changed => $self->{state});
1766 } 1913 }
1767} 1914}
1768 1915
1769sub _draw { 1916sub _draw {
1770 my ($self) = @_; 1917 my ($self) = @_;
1771 1918
1772 $self->SUPER::_draw; 1919 $self->SUPER::_draw;
1773 1920
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1921 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 1922
1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1923 my ($w, $h) = @$self{qw(w h)};
1924
1925 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1777 1926
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1927 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 1928
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1929 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 1930
… …
2045 my $self = $class->SUPER::new ( 2194 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2195 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2196 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2197 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2198 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2199 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2200 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2201 min_h => $::WIDTH / 80,
2053 vertical => 0, 2202 vertical => 0,
2054 can_hover => 1, 2203 can_hover => 1,
2055 inner_pad => .05, 2204 inner_pad => 0.02,
2056 @_ 2205 @_
2057 ); 2206 );
2058 2207
2059 $self->set_value ($self->{range}[0]); 2208 $self->set_value ($self->{range}[0]);
2060 $self->update; 2209 $self->update;
2061 2210
2062 $self 2211 $self
2063} 2212}
2064 2213
2214sub changed { }
2215
2216sub set_range {
2217 my ($self, $range) = @_;
2218
2219 ($range, $self->{range}) = ($self->{range}, $range);
2220
2221 $self->update
2222 if "@$range" ne "@{$self->{range}}";
2223}
2224
2065sub set_value { 2225sub set_value {
2066 my ($self, $value) = @_; 2226 my ($self, $value) = @_;
2067 2227
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2228 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2229
2070 $hi = $lo + 1 if $hi <= $lo; 2230 $hi = $lo + 1 if $hi <= $lo;
2071 2231
2232 $page = $hi - $lo if $page > $hi - $lo;
2233
2072 $value = $lo if $value < $lo; 2234 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2235 $value = $hi - $page if $value > $hi - $page;
2074 2236
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2237 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2238 if $unit;
2077 2239
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2240 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2241
2082 if ($value != $old_value) { 2242 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2243 $self->_emit (changed => $value);
2084 $self->update; 2244 $self->update;
2085 } 2245 }
2086} 2246}
2087 2247
2088sub size_request { 2248sub size_request {
2089 my ($self) = @_; 2249 my ($self) = @_;
2090 2250
2091 my $w = $self->{req_w}; 2251 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2252}
2096 2253
2097sub button_down { 2254sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
2099 2256
2100 $self->SUPER::button_down ($ev, $x, $y); 2257 $self->SUPER::button_down ($ev, $x, $y);
2258
2259 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260
2101 $self->mouse_motion ($ev, $x, $y); 2261 $self->mouse_motion ($ev, $x, $y);
2102} 2262}
2103 2263
2104sub mouse_motion { 2264sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2265 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2267 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2268 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2269
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2270 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2271
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2272 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2273
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2274 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2275 }
2116} 2276}
2117 2277
2118sub update { 2278sub update {
2119 my ($self) = @_; 2279 my ($self) = @_;
2120 2280
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2281 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2282 $self->set_value ($self->{range}[0]);
2123 2283
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2284 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100;
2125 2286
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2287 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2288
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2289 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2290 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2291
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2292 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2293 $value = $value * $self->{scale} + $self->{offset};
2132 2294
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; 2295 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2296 $self->{knob_w} = $knob_w;
2140 }); 2297 });
2141 2298
2142 $self->SUPER::update; 2299 $self->SUPER::update;
2143} 2300}
2144 2301
… …
2168 # draw handle 2325 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2326 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2327
2171 glDisable GL_TEXTURE_2D; 2328 glDisable GL_TEXTURE_2D;
2172} 2329}
2330
2331#############################################################################
2332
2333package CFClient::UI::ValSlider;
2334
2335our @ISA = CFClient::UI::HBox::;
2336
2337sub new {
2338 my ($class, %arg) = @_;
2339
2340 my $range = delete $arg{range};
2341
2342 my $self = $class->SUPER::new (
2343 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2344 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2345 to_value => sub { shift },
2346 from_value => sub { shift },
2347 %arg,
2348 );
2349
2350 $self->{slider}->connect (changed => sub {
2351 my ($self, $value) = @_;
2352 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2353 $self->{parent}->emit (changed => $value);
2354 });
2355
2356# $self->{entry}->connect (changed => sub {
2357# my ($self, $value) = @_;
2358# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2359# $self->{parent}->emit (changed => $value);
2360# });
2361
2362 $self->add ($self->{slider}, $self->{entry});
2363
2364 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2365
2366 $self
2367}
2368
2369sub set_range { shift->{slider}->set_range (@_) }
2370sub set_value { shift->{slider}->set_value (@_) }
2173 2371
2174############################################################################# 2372#############################################################################
2175 2373
2176package CFClient::UI::TextView; 2374package CFClient::UI::TextView;
2177 2375
… …
2207 2405
2208 $self->{fontsize} = $fontsize; 2406 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2407 $self->reflow;
2210} 2408}
2211 2409
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 { 2410sub size_allocate {
2232 my ($self, $w, $h) = @_; 2411 my ($self, $w, $h) = @_;
2233 2412
2234 $self->SUPER::size_allocate ($w, $h); 2413 $self->SUPER::size_allocate ($w, $h);
2235 2414
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2417 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2418
2240 $self->reflow; 2419 $self->reflow;
2241} 2420}
2242 2421
2422sub text_size {
2423 my ($self, $text, $indent) = @_;
2424
2425 my $layout = $self->{layout};
2426
2427 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2428 $layout->set_width ($self->{children}[0]{w} - $indent);
2429 $layout->set_markup ($text);
2430
2431 $layout->size
2432}
2433
2434sub reflow {
2435 my ($self) = @_;
2436
2437 $self->{need_reflow}++;
2438 $self->update;
2439}
2440
2441sub set_offset {
2442 my ($self, $offset) = @_;
2443
2444 # todo: base offset on lines or so, not on pixels
2445 $self->{children}[1]->set_value ($offset);
2446}
2447
2448sub clear {
2449 my ($self) = @_;
2450
2451 $self->{par} = [];
2452 $self->{height} = 0;
2453 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2454}
2455
2243sub add_paragraph { 2456sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2457 my ($self, $color, $text, $indent) = @_;
2245 2458
2246 #TODO: intelligently "reformat" paragraph 2459 for my $line (split /\n/, $text) {
2247 2460 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2461 $self->{height} += $h;
2462 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2463 }
2251 2464
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2465 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255 $self->{children}[1]->update;
2256} 2466}
2257 2467
2258sub update { 2468sub update {
2259 my ($self) = @_; 2469 my ($self) = @_;
2260 2470
… …
2263 return unless $self->{h} > 0; 2473 return unless $self->{h} > 0;
2264 2474
2265 delete $self->{texture}; 2475 delete $self->{texture};
2266 2476
2267 $ROOT->on_post_alloc ($self, sub { 2477 $ROOT->on_post_alloc ($self, sub {
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479
2268 if (delete $self->{need_reflow}) { 2480 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2481 my $height = 0;
2270 2482
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2483 my $layout = $self->{layout};
2484
2485 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2272 for @{$self->{par}}; 2487 for (@{$self->{par}}) {
2488 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2489 $layout->set_width ($W - $_->[3]);
2490 $layout->set_markup ($_->[4]);
2491 my ($w, $h) = $layout->size;
2492 $_->[0] = $w + $_->[3];
2493 $_->[1] = $h;
2494 }
2495
2496 $height += $_->[1];
2497 }
2273 2498
2274 $self->{height} = $height; 2499 $self->{height} = $height;
2275 2500
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2501 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2502
2278 delete $self->{texture}; 2503 delete $self->{texture};
2279 } 2504 }
2280 2505
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2506 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2507 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2508 glClear GL_COLOR_BUFFER_BIT;
2284 2509
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]; 2510 my $top = int $self->{children}[1]{range}[0];
2289 2511
2290 my $y0 = $top; 2512 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2513 my $y1 = $top + $H;
2292 2514
2293 my $y = 0; 2515 my $y = 0;
2294 2516
2295 my $layout = $self->{layout}; 2517 my $layout = $self->{layout};
2296 2518
2297 $layout->set_font ($self->{font}) if $self->{font}; 2519 $layout->set_font ($self->{font}) if $self->{font};
2298 2520
2521 glEnable GL_BLEND;
2522 #TODO# not correct in windows where rgba is forced off
2523 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2524
2299 for my $par (@{$self->{par}}) { 2525 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2526 my $h = $par->[1];
2301 2527
2302 if ($y0 < $y + $h && $y < $y1) { 2528 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2529 $layout->set_foreground (@{ $par->[2] });
2530 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2531 $layout->set_markup ($par->[4]);
2305 2532
2306 my ($W, $H) = $layout->size; 2533 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2534
2535 glRasterPos $par->[3], $y - $y0;
2536 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2537 }
2309 2538
2310 $y += $h; 2539 $y += $h;
2311 } 2540 }
2312 2541
2313 glDisable GL_TEXTURE_2D; 2542 glDisable GL_BLEND;
2314 }; 2543 };
2315 }); 2544 });
2316} 2545}
2317 2546
2318sub _draw { 2547sub _draw {
… …
2378 2607
2379sub new { 2608sub new {
2380 my $class = shift; 2609 my $class = shift;
2381 2610
2382 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2383 state => 0, 2612 state => 0,
2384 connect_activate => \&toggle_flopper, 2613 on_activate => \&toggle_flopper,
2385 @_ 2614 @_
2386 ); 2615 );
2387 2616
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2617 $self
2394} 2618}
2395 2619
2396sub toggle_flopper { 2620sub toggle_flopper {
2397 my ($self) = @_; 2621 my ($self) = @_;
2398 2622
2399 # TODO: use animation 2623 $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} 2624}
2411 2625
2412############################################################################# 2626#############################################################################
2413 2627
2414package CFClient::UI::Tooltip; 2628package CFClient::UI::Tooltip;
… …
2427} 2641}
2428 2642
2429sub set_tooltip_from { 2643sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2644 my ($self, $widget) = @_;
2431 2645
2646 my $tooltip = $widget->{tooltip};
2647
2648 if ($ENV{CFPLUS_DEBUG} & 2) {
2649 $tooltip .= "\n\n" . (ref $widget) . "\n"
2650 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651 . "req $widget->{req_w} $widget->{req_h}\n"
2652 . "visible $widget->{visible}";
2653 }
2654
2432 $self->add (new CFClient::UI::Label 2655 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2656 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2657 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2658 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2659 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2660 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2661 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2449 2672
2450sub size_allocate { 2673sub size_allocate {
2451 my ($self, $w, $h) = @_; 2674 my ($self, $w, $h) = @_;
2452 2675
2453 $self->SUPER::size_allocate ($w - 4, $h - 4); 2676 $self->SUPER::size_allocate ($w - 4, $h - 4);
2677}
2678
2679sub visibility_change {
2680 my ($self, $visible) = @_;
2681
2682 return unless $visible;
2683
2684 $self->{root}->on_post_alloc ("move_$self" => sub {
2685 my $widget = $self->{owner}
2686 or return;
2687
2688 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689
2690 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691 if $x + $self->{w} > $::WIDTH;
2692
2693 $self->move_abs ($x, $y);
2694 });
2454} 2695}
2455 2696
2456sub _draw { 2697sub _draw {
2457 my ($self) = @_; 2698 my ($self) = @_;
2458 2699
… …
2475 glVertex $w, $h; 2716 glVertex $w, $h;
2476 glVertex $w, 0; 2717 glVertex $w, 0;
2477 glEnd; 2718 glEnd;
2478 2719
2479 glTranslate 2 - 0.375, 2 - 0.375; 2720 glTranslate 2 - 0.375, 2 - 0.375;
2721
2480 $self->SUPER::_draw; 2722 $self->SUPER::_draw;
2481} 2723}
2482 2724
2483############################################################################# 2725#############################################################################
2484 2726
… …
2489use CFClient::OpenGL; 2731use CFClient::OpenGL;
2490 2732
2491sub new { 2733sub new {
2492 my $class = shift; 2734 my $class = shift;
2493 2735
2494 $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2495 aspect => 1, 2737 aspect => 1,
2738 can_events => 0,
2496 @_, 2739 @_,
2497 ) 2740 );
2741
2742 if ($self->{anim} && $self->{animspeed}) {
2743 Scalar::Util::weaken (my $widget = $self);
2744
2745 $self->{timer} = Event->timer (
2746 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2747 hard => 1,
2748 interval => $self->{animspeed},
2749 cb => sub {
2750 ++$widget->{frame};
2751 $widget->update;
2752 },
2753 );
2754 }
2755
2756 $self
2498} 2757}
2499 2758
2500sub size_request { 2759sub size_request {
2501 (32, 8) 2760 (32, 8)
2502} 2761}
2503 2762
2763sub update {
2764 my ($self) = @_;
2765
2766 return unless $self->{visible};
2767
2768 $self->SUPER::update;
2769}
2770
2504sub _draw { 2771sub _draw {
2505 my ($self) = @_; 2772 my ($self) = @_;
2506 2773
2507 return unless $::CONN;#d# manage and cache textures differently 2774 return unless $::CONN;
2775
2776 my $face;
2777
2778 if ($self->{frame}) {
2779 my $anim = $::CONN->{anim}[$self->{anim}];
2780
2781 $face = $anim->[ $self->{frame} % @$anim ]
2782 if $anim && @$anim;
2783 }
2784
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2785 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2786
2510 # TODO animation
2511 if ($tex) { 2787 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2788 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2790 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2792 glDisable GL_TEXTURE_2D;
2517 } 2793 }
2518} 2794}
2519 2795
2520############################################################################# 2796sub DESTROY {
2521
2522package CFClient::UI::InventoryItem;
2523
2524our @ISA = CFClient::UI::HBox::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_; 2797 my ($self) = @_;
2528 2798
2529 my $desc = 2799 $self->{timer}->cancel
2530 $item->{nrof} < 2 2800 if $self->{timer};
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533 2801
2534 $item->{flags} & Crossfire::Protocol::F_OPEN 2802 $self->SUPER::DESTROY;
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
2552sub new {
2553 my $class = shift;
2554
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 (
2562 can_hover => 1,
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 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668} 2803}
2669 2804
2670############################################################################# 2805#############################################################################
2671 2806
2672package CFClient::UI::Menu; 2807package CFClient::UI::Menu;
… …
2707 2842
2708# popup given the event (must be a mouse button down event currently) 2843# popup given the event (must be a mouse button down event currently)
2709sub popup { 2844sub popup {
2710 my ($self, $ev) = @_; 2845 my ($self, $ev) = @_;
2711 2846
2712 $self->emit ("popdown"); 2847 $self->_emit ("popdown");
2713 2848
2714 # maybe save $GRAB? must be careful about events... 2849 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 2850 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 2851 $self->{button} = $ev->{button};
2717 2852
2718 $self->show; 2853 $self->show;
2719 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2854 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720} 2855}
2721 2856
2722sub mouse_motion { 2857sub mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 2858 my ($self, $ev, $x, $y) = @_;
2724 2859
… …
2732 2867
2733 if ($ev->{button} == $self->{button}) { 2868 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 2869 undef $GRAB;
2735 $self->hide; 2870 $self->hide;
2736 2871
2737 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 2873 $self->{hover}[1]->() if $self->{hover};
2739 } 2874 }
2740} 2875}
2741 2876
2742############################################################################# 2877#############################################################################
… …
2804sub add { 2939sub add {
2805 my ($self, $text, %arg) = @_; 2940 my ($self, $text, %arg) = @_;
2806 2941
2807 $text =~ s/^\s+//; 2942 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2943 $text =~ s/\s+$//;
2944
2945 return unless $text;
2809 2946
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2947 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2948
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2949 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2950
… …
2847 $self->SUPER::reconfigure; 2984 $self->SUPER::reconfigure;
2848} 2985}
2849 2986
2850############################################################################# 2987#############################################################################
2851 2988
2852package CFClient::UI::Root; 2989package CFClient::UI::Inventory;
2853 2990
2854our @ISA = CFClient::UI::Container::; 2991our @ISA = CFClient::UI::ScrolledWindow::;
2855
2856use CFClient::OpenGL;
2857 2992
2858sub new { 2993sub new {
2859 my $class = shift; 2994 my $class = shift;
2860 2995
2861 $class->SUPER::new ( 2996 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2862 @_, 2998 @_,
2863 ) 2999 );
2864}
2865 3000
2866sub configure { 3001 $self
3002}
3003
3004sub set_items {
3005 my ($self, $items) = @_;
3006
3007 $self->{scrolled}->clear;
3008 return unless $items;
3009
3010 my @items = sort {
3011 ($a->{type} <=> $b->{type})
3012 or ($a->{name} cmp $b->{name})
3013 } @$items;
3014
3015 $self->{real_items} = \@items;
3016
3017 my $row = 0;
3018 for my $item (@items) {
3019 CFClient::Item::update_widgets $item;
3020
3021 $self->{scrolled}->add (0, $row, $item->{face_widget});
3022 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3023 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3024
3025 $row++;
3026 }
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::BindEditor;
3032
3033our @ISA = CFClient::UI::FancyFrame::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3039
3040 $self->add (my $vb = new CFClient::UI::VBox);
3041
3042
3043 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3044 text => "start recording",
3045 tooltip => "Start/Stops recording of actions."
3046 ."All subsequent actions after the recording started will be captured."
3047 ."The actions are displayed after the record was stopped."
3048 ."To bind the action you have to click on the 'Bind' button",
3049 on_activate => sub {
3050 unless ($self->{recording}) {
3051 $self->start;
3052 } else {
3053 $self->stop;
3054 }
3055 });
3056
3057 $vb->add (new CFClient::UI::Label text => "Actions:");
3058 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3059
3060 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3061 $vb->add (my $hb = new CFClient::UI::HBox);
3062 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3063 $hb->add (new CFClient::UI::Button
3064 text => "bind",
3065 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3066 on_activate => sub {
3067 $self->ask_for_bind;
3068 });
3069
3070 $vb->add (my $hb = new CFClient::UI::HBox);
3071 $hb->add (new CFClient::UI::Button
3072 text => "ok",
3073 expand => 1,
3074 tooltip => "This closes the binding editor and saves the binding",
3075 on_activate => sub {
3076 $self->hide;
3077 $self->commit;
3078 });
3079
3080 $hb->add (new CFClient::UI::Button
3081 text => "cancel",
3082 expand => 1,
3083 tooltip => "This closes the binding editor without saving",
3084 on_activate => sub {
3085 $self->hide;
3086 $self->{binding_cancel}->()
3087 if $self->{binding_cancel};
3088 });
3089
3090 $self->update_binding_widgets;
3091
3092 $self
3093}
3094
3095sub commit {
3096 my ($self) = @_;
3097 my ($mod, $sym, $cmds) = $self->get_binding;
3098 if ($sym != 0 && @$cmds > 0) {
3099 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3100 ."'. Don't forget 'Save Config'!");
3101 $self->{binding_change}->($mod, $sym, $cmds)
3102 if $self->{binding_change};
3103 } else {
3104 $::STATUSBOX->add ("No action bound, no key or action specified!");
3105 $self->{binding_cancel}->()
3106 if $self->{binding_cancel};
3107 }
3108}
3109
3110sub start {
3111 my ($self) = @_;
3112
3113 $self->{rec_btn}->set_text ("stop recording");
3114 $self->{recording} = 1;
3115 $self->clear_command_list;
3116 $::CONN->start_record if $::CONN;
3117}
3118
3119sub stop {
3120 my ($self) = @_;
3121
3122 $self->{rec_btn}->set_text ("start recording");
3123 $self->{recording} = 0;
3124
3125 my $rec;
3126 $rec = $::CONN->stop_record if $::CONN;
3127 return unless ref $rec eq 'ARRAY';
3128 $self->set_command_list ($rec);
3129}
3130
3131# if $commit is true, the binding will be set after the user entered a key combo
3132sub ask_for_bind {
3133 my ($self, $commit) = @_;
3134
3135 CFClient::Binder::open_binding_dialog (sub {
3136 my ($mod, $sym) = @_;
3137 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3138 $self->update_binding_widgets;
3139 $self->commit if $commit;
3140 });
3141}
3142
3143# $mod and $sym are the modifiers and key symbol
3144# $cmds is a array ref of strings (the commands)
3145# $cb is the callback that is executed on OK
3146# $ccb is the callback that is executed on CANCEL and
3147# when the binding was unsuccessful on OK
3148sub set_binding {
2867 my ($self, $x, $y, $w, $h) = @_; 3149 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2868 3150
2869 $self->{w} = $w; 3151 $self->clear_command_list;
2870 $self->{h} = $h; 3152 $self->{recording} = 0;
2871} 3153 $self->{rec_btn}->set_text ("start recording");
2872 3154
2873sub check_size { 3155 $self->{binding} = [$mod, $sym];
3156 $self->{commands} = $cmds;
3157
3158 $self->{binding_change} = $cb;
3159 $self->{binding_cancel} = $ccb;
3160
3161 $self->update_binding_widgets;
3162}
3163
3164# this is a shortcut method that asks for a binding
3165# and then just binds it.
3166sub do_quick_binding {
2874 my ($self) = @_; 3167 my ($self, $cmds) = @_;
3168 $self->set_binding (undef, undef, $cmds, sub {
3169 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3170 });
3171 $self->ask_for_bind (1);
3172}
2875 3173
2876 $self->size_allocate ($self->{w}, $self->{h}) 3174sub update_binding_widgets {
2877 if $self->{w}; 3175 my ($self) = @_;
3176 my ($mod, $sym, $cmds) = $self->get_binding;
3177 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3178 $self->set_command_list ($cmds);
3179}
3180
3181sub get_binding {
3182 my ($self) = @_;
3183 return (
3184 $self->{binding}->[0],
3185 $self->{binding}->[1],
3186 [ grep { defined $_ } @{$self->{commands}} ]
3187 );
3188}
3189
3190sub clear_command_list {
3191 my ($self) = @_;
3192 $self->{cmdbox}->clear ();
3193}
3194
3195sub set_command_list {
3196 my ($self, $cmds) = @_;
3197
3198 $self->{cmdbox}->clear ();
3199 $self->{commands} = $cmds;
3200
3201 my $idx = 0;
3202
3203 for (@$cmds) {
3204 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3205
3206 my $i = $idx;
3207 $hb->add (new CFClient::UI::Label text => $_);
3208 $hb->add (new CFClient::UI::Button
3209 text => "delete",
3210 tooltip => "Deletes the action from the record",
3211 on_activate => sub {
3212 $self->{cmdbox}->remove ($hb);
3213 $cmds->[$i] = undef;
3214 });
3215
3216
3217 $idx++
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::SpellList;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (new CFClient::UI::ScrolledWindow
3233 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3234
3235 $self;
3236}
3237
3238# XXX: Do sorting? Argl...
3239sub add_spell {
3240 my ($self, $spell) = @_;
3241 $self->{spells}->{$spell->{name}} = $spell;
3242
3243 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244 face => $spell->{face},
3245 can_hover => 1,
3246 can_events => 1,
3247 tooltip => $spell->{message});
3248
3249 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => $spell->{name},
3251 can_hover => 1,
3252 can_events => 1,
3253 tooltip => $spell->{message},
3254 expand => 1);
3255
3256 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259 expand => 1);
3260
3261 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262 text => "bind to key",
3263 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264}
3265
3266sub rebuild_spell_list {
3267 my ($self) = @_;
3268 $self->{tbl_idx} = 0;
3269 $self->add_spell ($_) for values %{$self->{spells}};
3270}
3271
3272sub remove_spell {
3273 my ($self, $spell) = @_;
3274 delete $self->{spells}->{$spell->{name}};
3275 $self->rebuild_spell_list;
3276}
3277
3278#############################################################################
3279
3280package CFClient::UI::Root;
3281
3282our @ISA = CFClient::UI::Container::;
3283
3284use CFClient::OpenGL;
3285
3286sub new {
3287 my $class = shift;
3288
3289 my $self = $class->SUPER::new (
3290 visible => 1,
3291 @_,
3292 );
3293
3294 Scalar::Util::weaken ($self->{root} = $self);
3295
3296 $self
2878} 3297}
2879 3298
2880sub size_request { 3299sub size_request {
2881 my ($self) = @_; 3300 my ($self) = @_;
2882 3301
2883 ($self->{w}, $self->{h}) 3302 ($self->{w}, $self->{h})
3303}
3304
3305sub _to_pixel {
3306 my ($coord, $size, $max) = @_;
3307
3308 $coord =
3309 $coord eq "center" ? ($max - $size) * 0.5
3310 : $coord eq "max" ? $max
3311 : $coord;
3312
3313 $coord = 0 if $coord < 0;
3314 $coord = $max - $size if $coord > $max - $size;
3315
3316 int $coord + 0.5
2884} 3317}
2885 3318
2886sub size_allocate { 3319sub size_allocate {
2887 my ($self, $w, $h) = @_; 3320 my ($self, $w, $h) = @_;
2888 3321
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) { 3322 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3323 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 3324
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3325 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 3326 $Y = $child->{force_y} if exists $child->{force_y};
2900 3327
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3328 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 3329 $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 3330
2907 $child->configure ($X, $Y, $W, $H); 3331 $child->configure ($X, $Y, $W, $H);
2908 } 3332 }
2909} 3333}
2910 3334
… …
2921} 3345}
2922 3346
2923sub update { 3347sub update {
2924 my ($self) = @_; 3348 my ($self) = @_;
2925 3349
2926 $self->check_size;
2927 $::WANT_REFRESH++; 3350 $::WANT_REFRESH++;
2928} 3351}
2929 3352
2930sub add { 3353sub add {
2931 my ($self, @children) = @_; 3354 my ($self, @children) = @_;
2932 3355
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 3356 $_->{is_toplevel} = 1
2935 3357 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 3358
2941 $self->SUPER::add (@children); 3359 $self->SUPER::add (@children);
3360}
3361
3362sub remove {
3363 my ($self, @children) = @_;
3364
3365 $self->SUPER::remove (@children);
3366
3367 delete $self->{is_toplevel}
3368 for @children;
3369
3370 while (@children) {
3371 my $w = pop @children;
3372 push @children, $w->children;
3373 $w->set_invisible;
3374 }
2942} 3375}
2943 3376
2944sub on_refresh { 3377sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3378 my ($self, $id, $cb) = @_;
2946 3379
… …
2959 while ($self->{refresh_hook}) { 3392 while ($self->{refresh_hook}) {
2960 $_->() 3393 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3394 for values %{delete $self->{refresh_hook}};
2962 } 3395 }
2963 3396
2964 if ($self->{check_size}) { 3397 if ($self->{realloc}) {
2965 my @queue = ([], []); 3398 my %queue;
3399 my @queue;
3400 my $widget;
2966 3401
2967 for (;;) { 3402 outer:
2968 if ($self->{check_size}) { 3403 while () {
2969 # heuristic: check containers last 3404 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3405 for $widget (values %$realloc) {
2971 for values %{delete $self->{check_size}} 3406 $widget->{visible} or next; # do not resize invisible widgets
3407
3408 $queue{$widget+0}++ and next; # duplicates are common
3409
3410 push @{ $queue[$widget->{visible}] }, $widget;
3411 }
2972 } 3412 }
2973 3413
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3414 while () {
3415 @queue or last outer;
2975 3416
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3417 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 3418 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
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 3419
3420 pop @queue;
3421 }
3422
3423 delete $queue{$widget+0};
3424
3425 my ($w, $h) = $widget->size_request;
3426
3427 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3429
3430 $w = $widget->{force_w} if exists $widget->{force_w};
3431 $h = $widget->{force_h} if exists $widget->{force_h};
3432
3433 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3434 || delete $widget->{force_realloc}) {
2984 $widget->{req_w} = $w; 3435 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 3436 $widget->{req_h} = $h;
2986 3437
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3438 $self->{size_alloc}{$widget+0} = $widget;
2988 3439
2989 $widget->{parent}->check_size
2990 if $widget->{parent}; 3440 if (my $parent = $widget->{parent}) {
3441 $self->{realloc}{$parent+0} = $parent
3442 unless $queue{$parent+0};
3443
3444 $parent->{force_size_alloc} = 1;
3445 $self->{size_alloc}{$parent+0} = $parent;
3446 }
2991 } 3447 }
3448
3449 delete $self->{realloc}{$widget+0};
2992 } 3450 }
2993 } 3451 }
2994 3452
2995 while ($self->{size_alloc}) { 3453 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 3454 my @queue = sort { $b->{visible} <=> $a->{visible} }
2997 my ($widget, $w, $h) = @$_; 3455 values %$size_alloc;
3456
3457 while () {
3458 my $widget = pop @queue || last;
3459
3460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2998 3461
2999 $w = 0 if $w < 0; 3462 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3463 $h = 0 if $h < 0;
3001 3464
3465 $w = int $w + 0.5;
3466 $h = int $h + 0.5;
3467
3468 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3469 $widget->{old_w} = $widget->{w};
3470 $widget->{old_h} = $widget->{h};
3471
3002 $widget->{w} = $w; 3472 $widget->{w} = $w;
3003 $widget->{h} = $h; 3473 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 3474
3005 $widget->emit (size_allocate => $w, $h); 3475 $widget->emit (size_allocate => $w, $h);
3476 }
3006 } 3477 }
3007 } 3478 }
3008 3479
3009 while ($self->{post_alloc_hook}) { 3480 while ($self->{post_alloc_hook}) {
3010 $_->() 3481 $_->()
3011 for values %{delete $self->{post_alloc_hook}}; 3482 for values %{delete $self->{post_alloc_hook}};
3012 } 3483 }
3013 3484
3485
3014 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3486 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3487 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3488 glClear GL_COLOR_BUFFER_BIT;
3017 3489
3018 glMatrixMode GL_PROJECTION; 3490 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3491 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3492 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3493 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3494 glLoadIdentity;
3023 3495
3496 {
3497 package CFClient::UI::Base;
3498
3499 ($draw_x, $draw_y, $draw_w, $draw_h) =
3500 (0, 0, $self->{w}, $self->{h});
3501 }
3502
3024 $self->_draw; 3503 $self->_draw;
3025} 3504}
3026 3505
3027############################################################################# 3506#############################################################################
3028 3507

Diff Legend

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