ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.211 by elmex, Wed May 17 10:33:03 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
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 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
146 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
147 $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.]+$/;
148 $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};
149 $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};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 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
155 } 189 }
156
157 $widget->reconfigure;
158 } 190 }
191
192 reconfigure_widgets;
159} 193}
160 194
161############################################################################# 195#############################################################################
162 196
163package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
168 202
169sub new { 203sub new {
170 my $class = shift; 204 my $class = shift;
171 205
172 my $self = bless { 206 my $self = bless {
173 x => 0, 207 x => "center",
174 y => 0, 208 y => "center",
175 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
176 can_events => 1, 212 can_events => 1,
177 @_ 213 @_
178 }, $class; 214 }, $class;
179 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
180 for (keys %$self) { 218 for (keys %$self) {
181 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
183 } 221 }
184 } 222 }
185 223
186 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 }
187 235
188 $self 236 $self
189} 237}
190 238
191sub destroy { 239sub destroy {
… …
201 return if $self->{parent}; 249 return if $self->{parent};
202 250
203 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
204} 252}
205 253
206sub hide { 254sub set_visible {
207 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};
208 278
209 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
211 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
212 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
213 if $self->{parent}; 313 if $self->{parent};
214} 314}
215 315
216sub move { 316sub move_abs {
217 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
218 318
219 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
220 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
221 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
222 322
223 $self->update; 323 $self->update;
224} 324}
225 325
226sub set_size { 326sub set_size {
227 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
228 328
229 $self->{user_w} = $w; 329 $self->{force_w} = $w;
230 $self->{user_h} = $h; 330 $self->{force_h} = $h;
231 331
232 $self->check_size; 332 $self->realloc;
233} 333}
234 334
235sub size_request { 335sub size_request {
236 require Carp; 336 require Carp;
237 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
239 339
240sub configure { 340sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
242 342
243 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
246 348
247 # use alignment to adjust x, y 349 # use alignment to adjust x, y
248 350
249 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 353 }
254 354
255 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 356 $self->{x} = $x;
257 $self->{y} = $y; 357 $self->{y} = $y;
258 $self->update; 358 $self->update;
259 } 359 }
260 360
261 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $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;
263 } 368 }
264} 369}
265 370
266sub size_allocate { 371sub size_allocate {
267 # nothing to be done 372 # nothing to be done
268} 373}
269 374
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
278} 381}
279 382
280sub set_max_size { 383sub set_max_size {
281 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
282 385
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
285} 390}
286 391
287sub set_tooltip { 392sub set_tooltip {
288 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
289 399
290 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
291 401
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
… …
315 return if $FOCUS == $self; 425 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
317 427
318 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
319 429
320 $self->emit (focus_in => $focus); 430 $self->_emit (focus_in => $focus);
321 431
322 $focus->update if $focus; 432 $focus->update if $focus;
323 $FOCUS->update; 433 $FOCUS->update;
324} 434}
325 435
… …
328 438
329 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
330 440
331 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
332 442
333 $self->emit (focus_out => $focus); 443 $self->_emit (focus_out => $focus);
334 444
335 $focus->update if $focus; #? 445 $focus->update if $focus; #?
336}
337 446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
448 unless $FOCUS;
449}
450
338sub mouse_motion { } 451sub mouse_motion { 0 }
339sub button_up { } 452sub button_up { 0 }
340sub key_down { } 453sub key_down { 0 }
341sub key_up { } 454sub key_up { 0 }
342 455
343sub button_down { 456sub button_down {
344 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
345 458
346 $self->focus_in; 459 $self->focus_in;
347}
348 460
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
353sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
354 537
355sub draw { 538sub draw {
356 my ($self) = @_; 539 my ($self) = @_;
357 540
358 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
359 552
360 glPushMatrix; 553 glPushMatrix;
361 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
362 $self->_draw;
363 glPopMatrix;
364 555
365 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
366 my ($x, $y) = @$self{qw(x y)};
367
368 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
369 glEnable GL_BLEND; 558 glEnable GL_BLEND;
370 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
371 glBegin GL_QUADS; 560 glBegin GL_QUADS;
372 glVertex $x , $y;
373 glVertex $x + $self->{w}, $y;
374 glVertex $x + $self->{w}, $y + $self->{h};
375 glVertex $x , $y + $self->{h};
376 glEnd;
377 glDisable GL_BLEND;
378 }
379
380 if ($ENV{PCLIENT_DEBUG}) {
381 glPushMatrix;
382 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 561 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 562 glVertex $self->{w}, 0;
387 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w}, $self->{h};
388 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h};
389 glEnd; 565 glEnd;
566 glDisable GL_BLEND;
567 }
568
569 if ($ENV{CFPLUS_DEBUG} & 1) {
570 glPushMatrix;
571 glColor 1, 1, 0, 1;
572 glTranslate 0.375, 0.375;
573 glBegin GL_LINE_LOOP;
574 glVertex 0 , 0;
575 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1;
578 glEnd;
390 glPopMatrix; 579 glPopMatrix;
391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
393} 585}
394 586
395sub _draw { 587sub _draw {
396 my ($self) = @_; 588 my ($self) = @_;
397 589
398 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
399}
400
401sub find_widget {
402 my ($self, $x, $y) = @_;
403
404 return () unless $self->{can_events};
405
406 return $self
407 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
408 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
409
410 ()
411}
412
413sub set_parent {
414 my ($self, $parent) = @_;
415
416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
421}
422
423sub check_size {
424 my ($self, $forced) = @_;
425
426 $self->{force_alloc} = 1 if $forced;
427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428}
429
430sub update {
431 my ($self) = @_;
432
433 $self->{parent}->update
434 if $self->{parent};
435}
436
437sub connect {
438 my ($self, $signal, $cb) = @_;
439
440 push @{ $self->{signal_cb}{$signal} }, $cb;
441}
442
443sub emit {
444 my ($self, $signal, @args) = @_;
445
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
447} 591}
448 592
449sub DESTROY { 593sub DESTROY {
450 my ($self) = @_; 594 my ($self) = @_;
451 595
… …
483 627
484 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
485 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
486 630
487 glEnable GL_BLEND; 631 glEnable GL_BLEND;
488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
489 glColor @$color; 633 glColor_premultiply @$color;
490 634
491 glBegin GL_QUADS; 635 glBegin GL_QUADS;
492 glVertex 0 , 0; 636 glVertex 0 , 0;
493 glVertex 0 , $h; 637 glVertex 0 , $h;
494 glVertex $w, $h; 638 glVertex $w, $h;
… …
509 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
511} 655}
512 656
513sub size_request { 657sub size_request {
514 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
515} 661}
516 662
517sub draw { } 663sub draw { }
518 664
519############################################################################# 665#############################################################################
… …
523our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
524 670
525sub new { 671sub new {
526 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
527 673
528 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
529 675
530 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
531 children => [], 677 children => [],
532 can_events => 0, 678 can_events => 0,
533 %arg, 679 %arg,
534 ); 680 );
681
535 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
536 684
537 $self 685 $self
538} 686}
539 687
540sub add { 688sub add {
… …
548 $self->{children} = [ 696 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
551 ]; 699 ];
552 700
553 $self->check_size (1); 701 $self->realloc;
554 $self->update;
555} 702}
556 703
557sub children { 704sub children {
558 @{ $_[0]{children} } 705 @{ $_[0]{children} }
559} 706}
… …
564 delete $child->{parent}; 711 delete $child->{parent};
565 $child->hide; 712 $child->hide;
566 713
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 715
569 $self->check_size; 716 $self->realloc;
570 $self->update;
571} 717}
572 718
573sub clear { 719sub clear {
574 my ($self) = @_; 720 my ($self) = @_;
575 721
… …
579 for (@$children) { 725 for (@$children) {
580 delete $_->{parent}; 726 delete $_->{parent};
581 $_->hide; 727 $_->hide;
582 } 728 }
583 729
584 $self->check_size; 730 $self->realloc;
585 $self->update;
586} 731}
587 732
588sub find_widget { 733sub find_widget {
589 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
590 735
591 $x -= $self->{x}; 736 $x -= $self->{x};
592 $y -= $self->{y}; 737 $y -= $self->{y};
593 738
594 my $res; 739 my $res;
595 740
596 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
597 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
598 and return $res; 743 and return $res;
599 } 744 }
600 745
601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
650 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
651} 796}
652 797
653############################################################################# 798#############################################################################
654 799
800# back-buffered drawing area
801
655package CFClient::UI::Window; 802package CFClient::UI::Window;
656 803
657our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
658 805
659use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
677 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
678 $self->update; 825 $self->update;
679} 826}
680 827
681sub _render { 828sub _render {
829 my ($self) = @_;
830
682 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
683} 832}
684 833
685sub render_child { 834sub render_child {
686 my ($self) = @_; 835 my ($self) = @_;
687 836
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
691 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
692 $self->_render; 848 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 849 };
701} 850}
702 851
703sub _draw { 852sub _draw {
704 my ($self) = @_; 853 my ($self) = @_;
705 854
706 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
707 856
708 my $tex = $self->{texture} 857 my $tex = $self->{texture}
709 or return; 858 or return;
710 859
711 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
… …
721 870
722package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
723 872
724our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
725 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
726sub size_request { 885sub size_request {
727 my ($self) = @_; 886 my ($self) = @_;
728 887
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 889
732 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
733} 894}
734 895
735sub size_allocate { 896sub size_allocate {
736 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
737 898
899 my $child = $self->child;
900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
904 $self->child->configure (0, 0, $w, $h);
738 $self->update; 905 $self->update;
739} 906}
740 907
741sub set_offset { 908sub set_offset {
742 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
… …
776} 943}
777 944
778sub _render { 945sub _render {
779 my ($self) = @_; 946 my ($self) = @_;
780 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782 952
783 $self->SUPER::_render; 953 $self->SUPER::_render;
784} 954}
785 955
… …
788package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
789 959
790our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
791 961
792sub new { 962sub new {
793 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
794 966
795 my $self; 967 my $self;
796 968
797 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
798 vertical => 1, 970 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 972 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 973 $self->{vp}->set_offset (0, $_[1]);
802 }, 974 },
803 ; 975 ;
804 976
805 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 978 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 979 slider => $slider,
808 @_, 980 %arg,
809 ); 981 );
810 982
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
814 985
815 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
993}
994
995sub update {
996 my ($self) = @_;
997
998 $self->SUPER::update;
999
1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003}
1004
1005sub size_allocate {
1006 my ($self, $w, $h) = @_;
1007
1008 $self->SUPER::size_allocate ($w, $h);
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 1012}
817 1013
818#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 1015# update viewport offset on scroll
820 1016
… …
840 1036
841 if ($self->{bg}) { 1037 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
843 1039
844 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
846 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
847 1043
848 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
849 glVertex 0 , 0; 1045 glVertex 0 , 0;
850 glVertex 0 , $h; 1046 glVertex 0 , $h;
851 glVertex $w, $h; 1047 glVertex $w, $h;
… …
864 1060
865our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
866 1062
867use CFClient::OpenGL; 1063use CFClient::OpenGL;
868 1064
869my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
871 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872 1072
873sub new { 1073sub new {
874 my $class = shift; 1074 my ($class, %arg) = @_;
875 1075
876 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
877 1077
878 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1081 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1082 can_events => 1,
884 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
885 ); 1086 );
886 1087
887 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
888 align => 0, 1089 align => 0,
889 valign => 1, 1090 valign => 1,
890 text => $self->{title}, 1091 text => $title,
891 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
892 1094
893 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
894} 1103}
895 1104
896sub border { 1105sub border {
897 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
898} 1107}
899 1108
900sub size_request { 1109sub size_request {
901 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
902 1114
903 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
904 1116
905 ( 1117 (
906 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
909} 1121}
910 1122
911sub size_allocate { 1123sub size_allocate {
912 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
913 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
914 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
915 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
916 1136
917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
918 if $self->{title};
919
920 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
921} 1138}
922 1139
923sub button_down { 1140sub button_down {
924 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
925 1142
… …
941 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
942 1159
943 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
945 1162
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size; 1167 $self->realloc;
950 }; 1168 };
951 1169
952 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1174 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
958 1176
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
960 1178
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
963 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
964 } 1187 1
965} 1188}
966 1189
967sub button_up { 1190sub button_up {
968 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
969 1192
970 delete $self->{motion}; 1193 !!delete $self->{motion}
971} 1194}
972 1195
973sub mouse_motion { 1196sub mouse_motion {
974 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
975 1198
976 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
977} 1202}
978 1203
979sub _draw { 1204sub _draw {
980 my ($self) = @_; 1205 my ($self) = @_;
981 1206
1207 my $child = $self->{children}[0];
1208
982 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
984 1211
985 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1214
988 my $border = $self->border; 1215 my $border = $self->border;
989 1216
990 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1222
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
998 1225
999 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1002
1003 glColor @{ $self->{bg} };
1004
1005 $bg->{s} = $rep_x;
1006 $bg->{t} = $rep_y;
1007 $bg->{wrap_mode} = 1;
1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1231 }
1010 1232
1011 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1012 1234
1013 $self->{title}->draw if $self->{title};
1014
1015 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1016} 1241}
1017 1242
1018############################################################################# 1243#############################################################################
1019 1244
1020package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1028sub new { 1253sub new {
1029 my $class = shift; 1254 my $class = shift;
1030 1255
1031 $class->SUPER::new ( 1256 $class->SUPER::new (
1032 col_expand => [], 1257 col_expand => [],
1033 @_ 1258 @_,
1034 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1264}
1036 1265
1037sub add { 1266sub add {
1038 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1039 1268
1040 $child->set_parent ($self); 1269 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1042 1271
1043 $child->check_size; 1272 $self->realloc;
1044} 1273}
1045 1274
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# TODO: move to container class maybe? send childs a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1276sub clear {
1052 my ($self) = @_; 1277 my ($self) = @_;
1053 1278
1054 my @children = $self->children; 1279 my @children = $self->children;
1055 delete $self->{children}; 1280 delete $self->{children};
… …
1057 for (@children) { 1282 for (@children) {
1058 delete $_->{parent}; 1283 delete $_->{parent};
1059 $_->hide; 1284 $_->hide;
1060 } 1285 }
1061 1286
1062 $self->update; 1287 $self->realloc;
1063} 1288}
1064 1289
1065sub get_wh { 1290sub get_wh {
1066 my ($self) = @_; 1291 my ($self) = @_;
1067 1292
… …
1098sub size_allocate { 1323sub size_allocate {
1099 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1100 1325
1101 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1102 1327
1103 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1105 1330
1106 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1388 }
1164} 1389}
1165 1390
1166############################################################################# 1391#############################################################################
1167 1392
1168package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1169
1170# TODO: wrap into common Box base class
1171 1394
1172our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1173 1396
1174sub size_request { 1397sub size_request {
1175 my ($self) = @_; 1398 my ($self) = @_;
1176 1399
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1178 1401 ? (
1179 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1180 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181 (List::Util::max map $_->[1], @alloc), 1404 )
1182 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1183} 1409}
1184 1410
1185sub size_allocate { 1411sub size_allocate {
1186 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1187 1413
1188 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1189
1190 my $children = $self->{children}; 1415 my $children = $self->{children};
1191 1416
1192 my @h = map $_->{req_w}, @$children; 1417 my @req;
1193 1418
1194 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1195 1420 @req = ($space / (@$children || 1)) x @$children;
1196 if ($req_h > $h) {
1197 # ah well, not enough space
1198 $_ *= $h / $req_h for @h;
1199 } else { 1421 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1423 my $req = List::Util::sum @req;
1424
1425 if ($req > $space) {
1426 # ah well, not enough space
1427 $_ *= $space / $req for @req;
1428 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201 $exp ||= 1;
1202 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1203 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1204 my $child = $children->[$_];
1205
1206 my $alloc_h = $h[$_];
1207 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208 $h[$_] = $alloc_h;
1209 } 1435 }
1210 } 1436 }
1211 1437
1212 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1213 1439
1214 my $y = 0; 1440 my $pos = 0;
1215 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1218 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219 1444
1220 $y += $h; 1445 $pos += $alloc;
1221 } 1446 }
1222 1447
1223 1 1448 1
1224} 1449}
1225 1450
1226############################################################################# 1451#############################################################################
1227 1452
1453package CFClient::UI::HBox;
1454
1455our @ISA = CFClient::UI::Box::;
1456
1457sub new {
1458 my $class = shift;
1459
1460 $class->SUPER::new (
1461 vertical => 0,
1462 @_,
1463 )
1464}
1465
1466#############################################################################
1467
1228package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1229 1469
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1233 1471
1234sub size_request { 1472sub new {
1235 my ($self) = @_; 1473 my $class = shift;
1236 1474
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1238 1476 vertical => 1,
1239 ( 1477 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1478 )
1243}
1244
1245sub size_allocate {
1246 my ($self, $w, $h) = @_;
1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250 my $children = $self->{children};
1251
1252 my @h = map $_->{req_h}, @$children;
1253
1254 my $req_h = List::Util::sum @h;
1255
1256 if ($req_h > $h) {
1257 # ah well, not enough space
1258 $_ *= $h / $req_h for @h;
1259 } else {
1260 my $exp = List::Util::sum map $_->{expand}, @$children;
1261 $exp ||= 1;
1262
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265
1266 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267 }
1268 }
1269
1270 CFClient::UI::harmonize \@h;
1271
1272 my $y = 0;
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275 my $h = $h[$_];
1276 $child->configure (0, $y, $w, $h);
1277
1278 $y += $h;
1279 }
1280
1281 1
1282} 1479}
1283 1480
1284############################################################################# 1481#############################################################################
1285 1482
1286package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1297 #bg => none 1494 #bg => none
1298 #active_bg => none 1495 #active_bg => none
1299 #font => default_font 1496 #font => default_font
1300 #text => initial text 1497 #text => initial text
1301 #markup => initial narkup 1498 #markup => initial narkup
1499 #max_w => maximum pixel width
1500 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1303 fontsize => 1, 1502 fontsize => 1,
1304 align => -1, 1503 align => -1,
1305 valign => -1, 1504 valign => -1,
1306 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1307 can_events => 0, 1507 can_events => 0,
1308 %arg 1508 %arg
1309 ); 1509 );
1310 1510
1311 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1338 1538
1339 delete $self->{texture}; 1539 delete $self->{texture};
1340 $self->SUPER::update; 1540 $self->SUPER::update;
1341} 1541}
1342 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1343sub set_text { 1550sub set_text {
1344 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1345 1552
1346 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1347 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1348 1555
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1351 1559
1560 $self->realloc;
1352 $self->update; 1561 $self->update;
1353 $self->check_size;
1354} 1562}
1355 1563
1356sub set_markup { 1564sub set_markup {
1357 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1358 1566
… …
1361 1569
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1571
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1366 1575
1576 $self->realloc;
1367 $self->update; 1577 $self->update;
1368 $self->check_size;
1369} 1578}
1370 1579
1371sub size_request { 1580sub size_request {
1372 my ($self) = @_; 1581 my ($self) = @_;
1373 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1591
1378 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1379 1593
1380 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1381 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1597
1384 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1385 1599
1386 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1388 } 1602 }
1389 1603
1604 ($w, $h)
1390 ( 1605 }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1606}
1395 1607
1396sub size_allocate { 1608sub size_allocate {
1397 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1398 1610
1611 delete $self->{ox};
1612
1399 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1615}
1401 1616
1402sub set_fontsize { 1617sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1404 1619
1405 $self->{fontsize} = $fontsize; 1620 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1621 delete $self->{texture};
1407 1622
1408 $self->update; 1623 $self->realloc;
1409 $self->check_size;
1410} 1624}
1411 1625
1412sub _draw { 1626sub _draw {
1413 my ($self) = @_; 1627 my ($self) = @_;
1414 1628
… …
1416 1630
1417 my $tex = $self->{texture} ||= do { 1631 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1632 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1633 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1638
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1639 new_from_layout CFClient::Texture $self->{layout}
1640 };
1424 1641
1642 unless (exists $self->{ox}) {
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1645 : ($self->{w} - $tex->{w}) * 0.5);
1428 1646
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1649 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1434 }; 1650 };
1435 1651
1436 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1438 1654
1655 glColor_premultiply @{$self->{fg}}
1439 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1440 glColor @{$self->{fg}}; 1657
1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1442 } else {
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1444 }
1445 1659
1446 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1447} 1661}
1448 1662
1449############################################################################# 1663#############################################################################
… …
1464 active_fg => [0, 0, 0], 1678 active_fg => [0, 0, 0],
1465 can_hover => 1, 1679 can_hover => 1,
1466 can_focus => 1, 1680 can_focus => 1,
1467 valign => 0, 1681 valign => 0,
1468 can_events => 1, 1682 can_events => 1,
1683 #text => ...
1469 @_ 1684 @_
1470 ) 1685 )
1471} 1686}
1472 1687
1473sub _set_text { 1688sub _set_text {
… …
1475 1690
1476 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1477 1692
1478 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1479 1694
1480 delete $self->{texture};
1481
1482 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1483 $self->{text} = $text; 1696 $self->{text} = $text;
1484 1697
1485 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1487 1701
1488 $self->emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1489} 1706}
1490 1707
1491sub set_text { 1708sub set_text {
1492 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1493 1710
1494 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1712 $self->_set_text ($text);
1496 $self->update;
1497 $self->check_size;
1498} 1713}
1499 1714
1500sub get_text { 1715sub get_text {
1501 $_[0]{text} 1716 $_[0]{text}
1502} 1717}
… …
1505 my ($self) = @_; 1720 my ($self) = @_;
1506 1721
1507 my ($w, $h) = $self->SUPER::size_request; 1722 my ($w, $h) = $self->SUPER::size_request;
1508 1723
1509 ($w + 1, $h) # add 1 for cursor 1724 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516} 1725}
1517 1726
1518sub key_down { 1727sub key_down {
1519 my ($self, $ev) = @_; 1728 my ($self, $ev) = @_;
1520 1729
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1744 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1745 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1746 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1749 $self->_emit ('escape');
1541 } elsif ($uni) { 1750 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1543 } 1754 }
1544 1755
1545 $self->_set_text ($text); 1756 $self->_set_text ($text);
1546 $self->update; 1757
1547 $self->check_size; 1758 $self->realloc;
1759
1760 1
1548} 1761}
1549 1762
1550sub focus_in { 1763sub focus_in {
1551 my ($self) = @_; 1764 my ($self) = @_;
1552 1765
… …
1567 utf8::encode $text; 1780 utf8::encode $text;
1568 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1569 1782
1570 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1571 $self->update; 1784 $self->update;
1785
1786 1
1572} 1787}
1573 1788
1574sub mouse_motion { 1789sub mouse_motion {
1575 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1576# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792
1793 0
1577} 1794}
1578 1795
1579sub _draw { 1796sub _draw {
1580 my ($self) = @_; 1797 my ($self) = @_;
1581 1798
1582 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1583 1800
1584 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1585 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1586 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1587 } else { 1804 } else {
1588 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1589 } 1806 }
1590 1807
1591 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1592 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1593 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1594 glVertex 0 , 0; 1811 glVertex 0 , 0;
1595 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1596 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1597 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1632 if ($sym == 13) { 1849 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1850 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1851 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1852 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1853 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1854 $self->_emit (activate => $txt);
1638 $self->update; 1855 $self->update;
1639 1856
1640 } elsif ($sym == CFClient::SDLK_UP) { 1857 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1858 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1859 $self->{history_saveback} = $self->get_text;
… …
1658 } else { 1875 } else {
1659 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1660 } 1877 }
1661 1878
1662 } else { 1879 } else {
1663 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1664 } 1883 1
1665
1666} 1884}
1667 1885
1668############################################################################# 1886#############################################################################
1669 1887
1670package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1679 1897
1680sub new { 1898sub new {
1681 my $class = shift; 1899 my $class = shift;
1682 1900
1683 $class->SUPER::new ( 1901 $class->SUPER::new (
1684 padding => 4, 1902 padding_x => 4,
1903 padding_y => 4,
1685 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1905 active_fg => [0, 0, 1],
1687 can_hover => 1, 1906 can_hover => 1,
1688 align => 0, 1907 align => 0,
1689 valign => 0, 1908 valign => 0,
1690 can_events => 1, 1909 can_events => 1,
1691 @_ 1910 @_
1692 ) 1911 )
1693} 1912}
1694 1913
1914sub activate { }
1915
1695sub button_up { 1916sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1697 1918
1919 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1921 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate"); 1922
1701 } 1923 1
1702} 1924}
1703 1925
1704sub _draw { 1926sub _draw {
1705 my ($self) = @_; 1927 my ($self) = @_;
1706 1928
1707 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1708
1709 if ($GRAB == $self) {
1710 $self->{fg} = $self->{active_fg};
1711 }
1712 1930
1713 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1715 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1716 1934
… …
1735 1953
1736sub new { 1954sub new {
1737 my $class = shift; 1955 my $class = shift;
1738 1956
1739 $class->SUPER::new ( 1957 $class->SUPER::new (
1740 padding => 2, 1958 padding_x => 2,
1959 padding_y => 2,
1741 fg => [1, 1, 1], 1960 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1961 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1962 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1963 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1964 state => 0,
… …
1749} 1968}
1750 1969
1751sub size_request { 1970sub size_request {
1752 my ($self) = @_; 1971 my ($self) = @_;
1753 1972
1754 ($self->{padding} * 2 + 6) x 2 1973 (6) x 2
1755} 1974}
1756 1975
1757sub button_down { 1976sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1977 my ($self, $ev, $x, $y) = @_;
1759 1978
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1764 } 1987 1
1765} 1988}
1766 1989
1767sub _draw { 1990sub _draw {
1768 my ($self) = @_; 1991 my ($self) = @_;
1769 1992
1770 $self->SUPER::_draw; 1993 $self->SUPER::_draw;
1771 1994
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1996
1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1997 my ($w, $h) = @$self{qw(w h)};
1998
1999 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1775 2000
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2001 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 2002
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2003 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 2004
… …
1934 2159
1935 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
1936 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
1937 2162
1938 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
1939 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1940 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
1941 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1942 2168
1943 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
1944 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2043 my $self = $class->SUPER::new ( 2269 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2270 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2271 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2272 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2273 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2274 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2275 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2276 min_h => $::WIDTH / 80,
2051 vertical => 0, 2277 vertical => 0,
2052 can_hover => 1, 2278 can_hover => 1,
2053 inner_pad => .05, 2279 inner_pad => 0.02,
2054 @_ 2280 @_
2055 ); 2281 );
2056 2282
2057 $self->set_value ($self->{range}[0]); 2283 $self->set_value ($self->{range}[0]);
2058 $self->update; 2284 $self->update;
2059 2285
2060 $self 2286 $self
2061} 2287}
2062 2288
2289sub changed { }
2290
2291sub set_range {
2292 my ($self, $range) = @_;
2293
2294 ($range, $self->{range}) = ($self->{range}, $range);
2295
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}";
2298}
2299
2063sub set_value { 2300sub set_value {
2064 my ($self, $value) = @_; 2301 my ($self, $value) = @_;
2065 2302
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2303 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2304
2068 $hi = $lo + 1 if $hi <= $lo; 2305 $hi = $lo + 1 if $hi <= $lo;
2069 2306
2307 $page = $hi - $lo if $page > $hi - $lo;
2308
2070 $value = $lo if $value < $lo; 2309 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2310 $value = $hi - $page if $value > $hi - $page;
2072 2311
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2312 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2313 if $unit;
2075 2314
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2316
2080 if ($value != $old_value) { 2317 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2318 $self->_emit (changed => $value);
2082 $self->update; 2319 $self->update;
2083 } 2320 }
2084} 2321}
2085 2322
2086sub size_request { 2323sub size_request {
2087 my ($self) = @_; 2324 my ($self) = @_;
2088 2325
2089 my $w = $self->{req_w}; 2326 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2327}
2094 2328
2095sub button_down { 2329sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2097 2331
2098 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2333
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335
2099 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2100} 2337}
2101 2338
2102sub mouse_motion { 2339sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2104 2341
2105 if ($GRAB == $self) { 2342 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2344
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2346
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2348
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2349 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2350 } else {
2351 return 0;
2352 }
2353
2113 } 2354 1
2114} 2355}
2115 2356
2116sub update { 2357sub update {
2117 my ($self) = @_; 2358 my ($self) = @_;
2118 2359
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2360 delete $self->{knob_w};
2361 $self->SUPER::update;
2362}
2363
2364sub _draw {
2365 my ($self) = @_;
2366
2367 unless ($self->{knob_w}) {
2120 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2121 2369
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2371 my $range = ($hi - $page - $lo) || 1e-100;
2123 2372
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2373 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2374
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2375 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2376 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2377
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2378 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2379 $value = $value * $self->{scale} + $self->{offset};
2130 2380
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2382 $self->{knob_w} = $knob_w;
2138 }); 2383 }
2139
2140 $self->SUPER::update;
2141}
2142
2143sub _draw {
2144 my ($self) = @_;
2145 2384
2146 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2147 2386
2148 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2149 2388
2150 if ($self->{vertical}) { 2389 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2390 # draw a vertical slider like a rotated horizontal slider
2152 2391
2392 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2393 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2394 }
2156 2395
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2396 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2397 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2398
… …
2166 # draw handle 2405 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2406 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2407
2169 glDisable GL_TEXTURE_2D; 2408 glDisable GL_TEXTURE_2D;
2170} 2409}
2410
2411#############################################################################
2412
2413package CFClient::UI::ValSlider;
2414
2415our @ISA = CFClient::UI::HBox::;
2416
2417sub new {
2418 my ($class, %arg) = @_;
2419
2420 my $range = delete $arg{range};
2421
2422 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift },
2426 from_value => sub { shift },
2427 %arg,
2428 );
2429
2430 $self->{slider}->connect (changed => sub {
2431 my ($self, $value) = @_;
2432 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2433 $self->{parent}->emit (changed => $value);
2434 });
2435
2436# $self->{entry}->connect (changed => sub {
2437# my ($self, $value) = @_;
2438# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2439# $self->{parent}->emit (changed => $value);
2440# });
2441
2442 $self->add ($self->{slider}, $self->{entry});
2443
2444 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2445
2446 $self
2447}
2448
2449sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) }
2171 2451
2172############################################################################# 2452#############################################################################
2173 2453
2174package CFClient::UI::TextView; 2454package CFClient::UI::TextView;
2175 2455
… …
2205 2485
2206 $self->{fontsize} = $fontsize; 2486 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2487 $self->reflow;
2208} 2488}
2209 2489
2210sub text_height {
2211 my ($self, $text) = @_;
2212
2213 my $layout = $self->{layout};
2214
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w});
2217 $layout->set_markup ($text);
2218
2219 ($layout->size)[1]
2220}
2221
2222sub reflow {
2223 my ($self) = @_;
2224
2225 $self->{need_reflow}++;
2226 $self->update;
2227}
2228
2229sub size_allocate { 2490sub size_allocate {
2230 my ($self, $w, $h) = @_; 2491 my ($self, $w, $h) = @_;
2231 2492
2232 $self->SUPER::size_allocate ($w, $h); 2493 $self->SUPER::size_allocate ($w, $h);
2233 2494
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2497 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2498
2238 $self->reflow; 2499 $self->reflow;
2239} 2500}
2240 2501
2502sub text_size {
2503 my ($self, $text, $indent) = @_;
2504
2505 my $layout = $self->{layout};
2506
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent);
2509 $layout->set_markup ($text);
2510
2511 $layout->size
2512}
2513
2514sub reflow {
2515 my ($self) = @_;
2516
2517 $self->{need_reflow}++;
2518 $self->update;
2519}
2520
2521sub set_offset {
2522 my ($self, $offset) = @_;
2523
2524 # todo: base offset on lines or so, not on pixels
2525 $self->{children}[1]->set_value ($offset);
2526}
2527
2528sub clear {
2529 my ($self) = @_;
2530
2531 $self->{par} = [];
2532 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534}
2535
2241sub add_paragraph { 2536sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2537 my ($self, $color, $text, $indent) = @_;
2243 2538
2244 #TODO: intelligently "reformat" paragraph 2539 for my $line (split /\n/, $text) {
2245 2540 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2541 $self->{height} += $h;
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2543 }
2249 2544
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2546}
2255 2547
2256sub update { 2548sub update {
2257 my ($self) = @_; 2549 my ($self) = @_;
2258 2550
… …
2261 return unless $self->{h} > 0; 2553 return unless $self->{h} > 0;
2262 2554
2263 delete $self->{texture}; 2555 delete $self->{texture};
2264 2556
2265 $ROOT->on_post_alloc ($self, sub { 2557 $ROOT->on_post_alloc ($self, sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559
2266 if (delete $self->{need_reflow}) { 2560 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2561 my $height = 0;
2268 2562
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2270 for @{$self->{par}}; 2567 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h;
2574 }
2575
2576 $height += $_->[1];
2577 }
2271 2578
2272 $self->{height} = $height; 2579 $self->{height} = $height;
2273 2580
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2582
2276 delete $self->{texture}; 2583 delete $self->{texture};
2277 } 2584 }
2278 2585
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2587 glClearColor 0, 0, 0, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2282 2589
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2287 2591
2288 my $y0 = $top; 2592 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2593 my $y1 = $top + $H;
2290 2594
2291 my $y = 0; 2595 my $y = 0;
2292 2596
2293 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2294 2598
2295 $layout->set_font ($self->{font}) if $self->{font}; 2599 $layout->set_font ($self->{font}) if $self->{font};
2296 2600
2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604
2297 for my $par (@{$self->{par}}) { 2605 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2606 my $h = $par->[1];
2299 2607
2300 if ($y0 < $y + $h && $y < $y1) { 2608 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2609 $layout->set_foreground (@{ $par->[2] });
2610 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2611 $layout->set_markup ($par->[4]);
2303 2612
2304 my ($W, $H) = $layout->size; 2613 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2614
2615 glRasterPos $par->[3], $y - $y0;
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2617 }
2307 2618
2308 $y += $h; 2619 $y += $h;
2309 } 2620 }
2310 2621
2311 glDisable GL_TEXTURE_2D; 2622 glDisable GL_BLEND;
2312 }; 2623 };
2313 }); 2624 });
2314} 2625}
2315 2626
2316sub _draw { 2627sub _draw {
2317 my ($self) = @_; 2628 my ($self) = @_;
2318 2629
2319 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2324 2635
2325 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2326 2637
… …
2376 2687
2377sub new { 2688sub new {
2378 my $class = shift; 2689 my $class = shift;
2379 2690
2380 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2381 state => 0, 2692 state => 0,
2382 connect_activate => \&toggle_flopper, 2693 on_activate => \&toggle_flopper,
2383 @_ 2694 @_
2384 ); 2695 );
2385 2696
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2697 $self
2392} 2698}
2393 2699
2394sub toggle_flopper { 2700sub toggle_flopper {
2395 my ($self) = @_; 2701 my ($self) = @_;
2396 2702
2397 # TODO: use animation 2703 $self->{other}->toggle_visibility;
2398 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open");
2402 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close");
2405 }
2406
2407 $self->emit (changed => $self->{state});
2408} 2704}
2409 2705
2410############################################################################# 2706#############################################################################
2411 2707
2412package CFClient::UI::Tooltip; 2708package CFClient::UI::Tooltip;
… …
2425} 2721}
2426 2722
2427sub set_tooltip_from { 2723sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2724 my ($self, $widget) = @_;
2429 2725
2726 my $tooltip = $widget->{tooltip};
2727
2728 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}";
2733 }
2734
2430 $self->add (new CFClient::UI::Label 2735 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2736 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2738 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2739 fg => [0, 0, 0, 1],
2740 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2741 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2742 );
2437} 2743}
2438 2744
2439sub size_request { 2745sub size_request {
2440 my ($self) = @_; 2746 my ($self) = @_;
… …
2446 2752
2447sub size_allocate { 2753sub size_allocate {
2448 my ($self, $w, $h) = @_; 2754 my ($self, $w, $h) = @_;
2449 2755
2450 $self->SUPER::size_allocate ($w - 4, $h - 4); 2756 $self->SUPER::size_allocate ($w - 4, $h - 4);
2757}
2758
2759sub visibility_change {
2760 my ($self, $visible) = @_;
2761
2762 return unless $visible;
2763
2764 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner}
2766 or return;
2767
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH;
2772
2773 $self->move_abs ($x, $y);
2774 });
2451} 2775}
2452 2776
2453sub _draw { 2777sub _draw {
2454 my ($self) = @_; 2778 my ($self) = @_;
2455 2779
… …
2472 glVertex $w, $h; 2796 glVertex $w, $h;
2473 glVertex $w, 0; 2797 glVertex $w, 0;
2474 glEnd; 2798 glEnd;
2475 2799
2476 glTranslate 2 - 0.375, 2 - 0.375; 2800 glTranslate 2 - 0.375, 2 - 0.375;
2801
2477 $self->SUPER::_draw; 2802 $self->SUPER::_draw;
2478} 2803}
2479 2804
2480############################################################################# 2805#############################################################################
2481 2806
… …
2486use CFClient::OpenGL; 2811use CFClient::OpenGL;
2487 2812
2488sub new { 2813sub new {
2489 my $class = shift; 2814 my $class = shift;
2490 2815
2491 $class->SUPER::new ( 2816 my $self = $class->SUPER::new (
2492 aspect => 1, 2817 aspect => 1,
2818 can_events => 0,
2493 @_, 2819 @_,
2494 ) 2820 );
2821
2822 if ($self->{anim} && $self->{animspeed}) {
2823 Scalar::Util::weaken (my $widget = $self);
2824
2825 $self->{timer} = Event->timer (
2826 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2827 hard => 1,
2828 interval => $self->{animspeed},
2829 cb => sub {
2830 ++$widget->{frame};
2831 $widget->update;
2832 },
2833 );
2834 }
2835
2836 $self
2495} 2837}
2496 2838
2497sub size_request { 2839sub size_request {
2498 (32, 8) 2840 (32, 8)
2499} 2841}
2500 2842
2843sub update {
2844 my ($self) = @_;
2845
2846 return unless $self->{visible};
2847
2848 $self->SUPER::update;
2849}
2850
2501sub _draw { 2851sub _draw {
2502 my ($self) = @_; 2852 my ($self) = @_;
2503 2853
2504 return unless $::CONN;#d# manage and cache textures differently 2854 return unless $::CONN;
2855
2856 my $face;
2857
2858 if ($self->{frame}) {
2859 my $anim = $::CONN->{anim}[$self->{anim}];
2860
2861 $face = $anim->[ $self->{frame} % @$anim ]
2862 if $anim && @$anim;
2863 }
2864
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2866
2507 # TODO animation
2508 if ($tex) { 2867 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2514 } 2873 }
2515} 2874}
2516 2875
2876sub DESTROY {
2877 my ($self) = @_;
2878
2879 $self->{timer}->cancel
2880 if $self->{timer};
2881
2882 $self->SUPER::DESTROY;
2883}
2884
2517############################################################################# 2885#############################################################################
2518 2886
2519package CFClient::UI::InventoryItem; 2887package CFClient::UI::Buttonbar;
2520 2888
2521our @ISA = CFClient::UI::HBox::; 2889our @ISA = CFClient::UI::HBox::;
2522 2890
2523sub new { 2891# TODO: should actualyl wrap buttons and other goodies.
2524 my $class = shift;
2525
2526 my %args = @_;
2527
2528 my $item = delete $args{item};
2529
2530 my $desc = $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 my $self = $class->SUPER::new (
2550 can_hover => 1,
2551 can_events => 1,
2552 tooltip => ((CFClient::UI::Label::escape $desc)
2553 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2554 connect_button_down => sub {
2555 my ($self, $ev, $x, $y) = @_;
2556
2557 # todo: maybe put examine on 1? but should just be a tooltip :(
2558 if ($ev->{button} == 1) {
2559 my $targ = $::CONN->{player}{tag};
2560
2561 if ($item->{container} == $::CONN->{player}{tag}) {
2562 $targ = $main::OPENCONT;
2563 }
2564
2565 $::CONN->send ("move $targ $item->{tag} 0");
2566 } elsif ($ev->{button} == 2) {
2567 $::CONN->send ("apply $item->{tag}");
2568 } elsif ($ev->{button} == 3) {
2569 my @menu_items = (
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2572 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2573 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2574 [
2575 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2576 sub { $::CONN->send ("lock $item->{tag}") },
2577 ],
2578 );
2579
2580 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2581 }
2582
2583 1
2584 },
2585 %args
2586 );
2587
2588 $self->add (new CFClient::UI::Face
2589 can_events => 0,
2590 face => $item->{face},
2591 anim => $item->{anim},
2592 animspeed => $item->{animspeed},
2593 );
2594
2595 $self->add (new CFClient::UI::Label
2596 can_events => 0,
2597 text => $desc,
2598 );
2599
2600 $self
2601}
2602
2603#############################################################################
2604
2605package CFClient::UI::Inventory;
2606
2607our @ISA = CFClient::UI::ScrolledWindow::;
2608
2609sub new {
2610 my $class = shift;
2611
2612 my $self = $class->SUPER::new (
2613 scrolled => (new CFClient::UI::VBox),
2614 @_,
2615 );
2616
2617 $self
2618}
2619
2620sub set_items {
2621 my ($self, $items) = @_;
2622
2623 $self->{scrolled}->clear;
2624 return unless $items;
2625
2626 my @items = sort {
2627 ($a->{type} <=> $b->{type})
2628 or ($a->{name} cmp $b->{name})
2629 } @$items;
2630
2631 $self->{real_items} = \@items;
2632
2633 for my $item (@items) {
2634 my $desc = $item->{nrof} < 2
2635 ? $item->{name}
2636 : "$item->{nrof} $item->{name_pl}";
2637
2638 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2639 }
2640
2641 $self->{scrolled}->add (@items);
2642
2643# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2644}
2645
2646sub size_request {
2647 my ($self) = @_;
2648 ($self->{req_w}, $self->{req_h});
2649}
2650 2892
2651############################################################################# 2893#############################################################################
2652 2894
2653package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2654 2896
… …
2688 2930
2689# popup given the event (must be a mouse button down event currently) 2931# popup given the event (must be a mouse button down event currently)
2690sub popup { 2932sub popup {
2691 my ($self, $ev) = @_; 2933 my ($self, $ev) = @_;
2692 2934
2693 $self->emit ("popdown"); 2935 $self->_emit ("popdown");
2694 2936
2695 # maybe save $GRAB? must be careful about events... 2937 # maybe save $GRAB? must be careful about events...
2696 $GRAB = $self; 2938 $GRAB = $self;
2697 $self->{button} = $ev->{button}; 2939 $self->{button} = $ev->{button};
2698 2940
2699 $self->show; 2941 $self->show;
2700 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2701} 2943}
2702 2944
2703sub mouse_motion { 2945sub mouse_motion {
2704 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2705 2947
2706 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2707 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2708 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2709} 2953}
2710 2954
2711sub button_up { 2955sub button_up {
2712 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2713 2957
2714 if ($ev->{button} == $self->{button}) { 2958 if ($ev->{button} == $self->{button}) {
2715 undef $GRAB; 2959 undef $GRAB;
2716 $self->hide; 2960 $self->hide;
2717 2961
2718 $self->emit ("popdown"); 2962 $self->_emit ("popdown");
2719 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2720 } 2968 1
2721} 2969}
2722 2970
2723############################################################################# 2971#############################################################################
2724 2972
2725package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2726 2974
2727our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2728 2976
2729sub new { 2977sub new {
2730 my $class = shift; 2978 my $class = shift;
2731 2979
2732 $class->SUPER::new ( 2980 my $self = $class->SUPER::new (
2981 @_,
2982 );
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986
2987 $self
2988}
2989
2990sub add {
2991 my ($self, @widgets) = @_;
2992
2993 $self->SUPER::add (@widgets);
2994
2995 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} };
2997}
2998
2999sub set_current_page {
3000 my ($self, $page_or_widget) = @_;
3001
3002 my $widget = ref $page_or_widget
3003 ? $page_or_widget
3004 : $self->{children}[$page_or_widget];
3005
3006 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008
3009 $self->_emit (page_changed => $self->{current});
3010
3011 $self->realloc;
3012}
3013
3014sub visible_children {
3015 $_[0]{current}
3016}
3017
3018sub size_request {
3019 my ($self) = @_;
3020
3021 $self->{current}->size_request
3022}
3023
3024sub size_allocate {
3025 my ($self, $w, $h) = @_;
3026
3027 $self->{current}->configure (0, 0, $w, $h);
3028}
3029
3030sub _draw {
3031 my ($self) = @_;
3032
3033 $self->{current}->draw;
3034}
3035
3036#############################################################################
3037
3038package CFClient::UI::Notebook;
3039
3040our @ISA = CFClient::UI::VBox::;
3041
3042sub new {
3043 my $class = shift;
3044
3045 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self
3049 @_,
3050 );
3051
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3054
3055 $self
3056}
3057
3058sub add {
3059 my ($self, $title, $widget, $tooltip) = @_;
3060
3061 Scalar::Util::weaken $self;
3062
3063 $self->{buttonbar}->add (new CFClient::UI::Button
3064 markup => $title,
3065 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) },
3067 );
3068
3069 $self->{multiplexer}->add ($widget);
3070}
3071
3072sub set_current_page {
3073 my ($self, $page) = @_;
3074
3075 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current});
3077}
3078
3079#############################################################################
3080
3081package CFClient::UI::Statusbox;
3082
3083our @ISA = CFClient::UI::VBox::;
3084
3085sub new {
3086 my $class = shift;
3087
3088 my $self = $class->SUPER::new (
2733 fontsize => 0.8, 3089 fontsize => 0.8,
2734 @_, 3090 @_,
2735 ) 3091 );
3092
3093 Scalar::Util::weaken (my $this = $self);
3094
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096
3097 $self
2736} 3098}
2737 3099
2738sub reorder { 3100sub reorder {
2739 my ($self) = @_; 3101 my ($self) = @_;
2740 my $NOW = time; 3102 my $NOW = Time::HiRes::time;
3103
3104 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} };
2741 3108
2742 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2743 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2744 } 3111 }
2745 3112
… …
2748 my @items = sort { 3115 my @items = sort {
2749 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2750 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2751 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2752 3119
3120 $self->{timer}->interval (1);
3121
2753 my $count = 10 + 1; 3122 my $count = 10 + 1;
2754 for my $item (@items) { 3123 for my $item (@items) {
2755 last unless --$count; 3124 last unless --$count;
2756 3125
2757 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2758 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2759 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2760 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2761 : $item->{text}; 3130 : $item->{text};
2762 3131
2763 my $fontsize = $item->{fontsize} || $self->{fontsize};
2764
2765 for ($short) { 3132 for ($short) {
2766 s/^\s+//; 3133 s/^\s+//;
2767 s/\s+/ /g; 3134 s/\s+/ /g;
2768 my $len = int 40 / $fontsize;
2769 substr $_, $len, length, "…" if $len < length;
2770 } 3135 }
2771 3136
2772 new CFClient::UI::Label 3137 new CFClient::UI::Label
2773 markup => $short, 3138 markup => $short,
2774 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2775 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2776 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2777 fontsize => $fontsize, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
3143 max_w => $::WIDTH * 0.44,
2778 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2779 can_events => 1, 3145 can_events => 1,
2780 can_hover => 1 3146 can_hover => 1
2781 }; 3147 };
3148
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1;
3154 $self->{timer}->interval (1/30);
3155 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 }
3158
3159 push @widgets, $label;
2782 } 3160 }
2783 3161
2784 $self->clear; 3162 $self->clear;
2785 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2786} 3164}
… …
2789 my ($self, $text, %arg) = @_; 3167 my ($self, $text, %arg) = @_;
2790 3168
2791 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2792 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2793 3171
3172 return unless $text;
3173
2794 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2795 3175
2796 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2797 3177
2798 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
2799 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
2819 } 3199 }
2820 3200
2821 $self->reorder; 3201 $self->reorder;
2822} 3202}
2823 3203
3204sub reconfigure {
3205 my ($self) = @_;
3206
3207 delete $_->{label}
3208 for values %{ $self->{item} || {} };
3209
3210 $self->reorder;
3211 $self->SUPER::reconfigure;
3212}
3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
2824############################################################################# 3222#############################################################################
2825 3223
2826package CFClient::UI::Root; 3224package CFClient::UI::Inventory;
2827 3225
2828our @ISA = CFClient::UI::Container::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
2829
2830use CFClient::OpenGL;
2831 3227
2832sub new { 3228sub new {
2833 my $class = shift; 3229 my $class = shift;
2834 3230
2835 $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
2836 @_, 3473 @_,
2837 ) 3474 )
2838} 3475}
2839 3476
2840sub configure { 3477# XXX: Do sorting? Argl...
2841 my ($self, $x, $y, $w, $h) = @_; 3478sub add_spell {
2842
2843 $self->{w} = $w;
2844 $self->{h} = $h;
2845}
2846
2847sub check_size {
2848 my ($self) = @_; 3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
2849 3481
2850 $self->size_allocate ($self->{w}, $self->{h}) 3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2851 if $self->{w}; 3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root;
3520
3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3524
3525use CFClient::OpenGL;
3526
3527sub new {
3528 my $class = shift;
3529
3530 my $self = $class->SUPER::new (
3531 visible => 1,
3532 @_,
3533 );
3534
3535 Scalar::Util::weaken ($self->{root} = $self);
3536
3537 $self
2852} 3538}
2853 3539
2854sub size_request { 3540sub size_request {
2855 my ($self) = @_; 3541 my ($self) = @_;
2856 3542
2857 ($self->{w}, $self->{h}) 3543 ($self->{w}, $self->{h})
3544}
3545
3546sub _to_pixel {
3547 my ($coord, $size, $max) = @_;
3548
3549 $coord =
3550 $coord eq "center" ? ($max - $size) * 0.5
3551 : $coord eq "max" ? $max
3552 : $coord;
3553
3554 $coord = 0 if $coord < 0;
3555 $coord = $max - $size if $coord > $max - $size;
3556
3557 int $coord + 0.5
2858} 3558}
2859 3559
2860sub size_allocate { 3560sub size_allocate {
2861 my ($self, $w, $h) = @_; 3561 my ($self, $w, $h) = @_;
2862 3562
2863 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2864 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2865
2866 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2867 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2868
2869 for my $child ($self->children) { 3563 for my $child ($self->children) {
2870 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2871 3565
2872 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3566 $X = $child->{force_x} if exists $child->{force_x};
2873 if exists $child->{req_x}; 3567 $Y = $child->{force_y} if exists $child->{force_y};
2874 3568
2875 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3569 $X = _to_pixel $X, $W, $self->{w};
2876 if exists $child->{req_y}; 3570 $Y = _to_pixel $Y, $H, $self->{h};
2877
2878 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2879 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2880 3571
2881 $child->configure ($X, $Y, $W, $H); 3572 $child->configure ($X, $Y, $W, $H);
2882 } 3573 }
2883} 3574}
2884 3575
… …
2895} 3586}
2896 3587
2897sub update { 3588sub update {
2898 my ($self) = @_; 3589 my ($self) = @_;
2899 3590
2900 $self->check_size;
2901 $::WANT_REFRESH++; 3591 $::WANT_REFRESH++;
2902} 3592}
2903 3593
2904sub add { 3594sub add {
2905 my ($self, @children) = @_; 3595 my ($self, @children) = @_;
2906 3596
2907 for my $child (@children) {
2908 $child->{toplevel} = 1; 3597 $_->{is_toplevel} = 1
2909 3598 for @children;
2910 # integerise window positions
2911 $child->{x} = int $child->{x};
2912 $child->{y} = int $child->{y};
2913 }
2914 3599
2915 $self->SUPER::add (@children); 3600 $self->SUPER::add (@children);
3601}
3602
3603sub remove {
3604 my ($self, @children) = @_;
3605
3606 $self->SUPER::remove (@children);
3607
3608 delete $self->{is_toplevel}
3609 for @children;
3610
3611 while (@children) {
3612 my $w = pop @children;
3613 push @children, $w->children;
3614 $w->set_invisible;
3615 }
2916} 3616}
2917 3617
2918sub on_refresh { 3618sub on_refresh {
2919 my ($self, $id, $cb) = @_; 3619 my ($self, $id, $cb) = @_;
2920 3620
… …
2933 while ($self->{refresh_hook}) { 3633 while ($self->{refresh_hook}) {
2934 $_->() 3634 $_->()
2935 for values %{delete $self->{refresh_hook}}; 3635 for values %{delete $self->{refresh_hook}};
2936 } 3636 }
2937 3637
2938 if ($self->{check_size}) { 3638 if ($self->{realloc}) {
2939 my @queue = ([], []); 3639 my %queue;
3640 my @queue;
3641 my $widget;
2940 3642
2941 for (;;) { 3643 outer:
2942 if ($self->{check_size}) { 3644 while () {
2943 # heuristic: check containers last 3645 if (my $realloc = delete $self->{realloc}) {
2944 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3646 for $widget (values %$realloc) {
2945 for values %{delete $self->{check_size}} 3647 $widget->{visible} or next; # do not resize invisible widgets
3648
3649 $queue{$widget+0}++ and next; # duplicates are common
3650
3651 push @{ $queue[$widget->{visible}] }, $widget;
3652 }
2946 } 3653 }
2947 3654
2948 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3655 while () {
3656 @queue or last outer;
2949 3657
2950 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3658 $widget = pop @{ $queue[-1] || [] }
2951 ? @$widget{qw(user_w user_h)} 3659 and last;
2952 : $widget->size_request;
2953
2954 if (delete $widget->{force_alloc}
2955 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2956 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2957 3660
3661 pop @queue;
3662 }
3663
3664 delete $queue{$widget+0};
3665
3666 my ($w, $h) = $widget->size_request;
3667
3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3673
3674 $w = $widget->{force_w} if exists $widget->{force_w};
3675 $h = $widget->{force_h} if exists $widget->{force_h};
3676
3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3678 || delete $widget->{force_realloc}) {
2958 $widget->{req_w} = $w; 3679 $widget->{req_w} = $w;
2959 $widget->{req_h} = $h; 3680 $widget->{req_h} = $h;
2960 3681
2961 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3682 $self->{size_alloc}{$widget+0} = $widget;
2962 3683
2963 $widget->{parent}->check_size
2964 if $widget->{parent}; 3684 if (my $parent = $widget->{parent}) {
3685 $self->{realloc}{$parent+0} = $parent
3686 unless $queue{$parent+0};
3687
3688 $parent->{force_size_alloc} = 1;
3689 $self->{size_alloc}{$parent+0} = $parent;
3690 }
2965 } 3691 }
3692
3693 delete $self->{realloc}{$widget+0};
2966 } 3694 }
2967 } 3695 }
2968 3696
2969 while ($self->{size_alloc}) { 3697 while (my $size_alloc = delete $self->{size_alloc}) {
2970 for (values %{delete $self->{size_alloc}}) { 3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
2971 my ($widget, $w, $h) = @$_; 3699 values %$size_alloc;
3700
3701 while () {
3702 my $widget = pop @queue || last;
3703
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2972 3705
2973 $w = 0 if $w < 0; 3706 $w = 0 if $w < 0;
2974 $h = 0 if $h < 0; 3707 $h = 0 if $h < 0;
2975 3708
3709 $w = int $w + 0.5;
3710 $h = int $h + 0.5;
3711
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w};
3714 $widget->{old_h} = $widget->{h};
3715
2976 $widget->{w} = $w; 3716 $widget->{w} = $w;
2977 $widget->{h} = $h; 3717 $widget->{h} = $h;
2978 $widget->size_allocate ($w, $h); 3718
2979 $widget->emit (size_allocate => $w, $h); 3719 $widget->emit (size_allocate => $w, $h);
3720 }
2980 } 3721 }
2981 } 3722 }
2982 3723
2983 while ($self->{post_alloc_hook}) { 3724 while ($self->{post_alloc_hook}) {
2984 $_->() 3725 $_->()
2985 for values %{delete $self->{post_alloc_hook}}; 3726 for values %{delete $self->{post_alloc_hook}};
2986 } 3727 }
2987 3728
3729
2988 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2989 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2990 glClear GL_COLOR_BUFFER_BIT; 3732 glClear GL_COLOR_BUFFER_BIT;
2991 3733
2992 glMatrixMode GL_PROJECTION; 3734 glMatrixMode GL_PROJECTION;
2993 glLoadIdentity; 3735 glLoadIdentity;
2994 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2995 glMatrixMode GL_MODELVIEW; 3737 glMatrixMode GL_MODELVIEW;
2996 glLoadIdentity; 3738 glLoadIdentity;
2997 3739
3740 {
3741 package CFClient::UI::Base;
3742
3743 ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h});
3745 }
3746
2998 $self->_draw; 3747 $self->_draw;
2999} 3748}
3000 3749
3001############################################################################# 3750#############################################################################
3002 3751
3003package CFClient::UI; 3752package CFClient::UI;
3004 3753
3005$ROOT = new CFClient::UI::Root; 3754$ROOT = new CFClient::UI::Root;
3006$TOOLTIP = new CFClient::UI::Tooltip; 3755$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3007 3756
30081 37571
3009 3758

Diff Legend

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