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.209 by root, Wed May 17 00:26:55 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 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 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $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}) {
… …
1347 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1348 1548
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1351 1551
1552 $self->realloc;
1352 $self->update; 1553 $self->update;
1353 $self->check_size;
1354} 1554}
1355 1555
1356sub set_markup { 1556sub set_markup {
1357 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1358 1558
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1563
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1366 1566
1567 $self->realloc;
1367 $self->update; 1568 $self->update;
1368 $self->check_size;
1369} 1569}
1370 1570
1371sub size_request { 1571sub size_request {
1372 my ($self) = @_; 1572 my ($self) = @_;
1373 1573
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1574 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1575 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1579
1378 my ($w, $h) = $self->{layout}->size; 1580 my ($w, $h) = $self->{layout}->size;
1379 1581
1380 if (exists $self->{template}) { 1582 if (exists $self->{template}) {
… …
1385 1587
1386 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1388 } 1590 }
1389 1591
1390 ( 1592 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1593}
1395 1594
1396sub size_allocate { 1595sub size_allocate {
1397 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1398 1597
1598 delete $self->{ox};
1599
1399 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1602}
1401 1603
1402sub set_fontsize { 1604sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1404 1606
1405 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1608 delete $self->{texture};
1407 1609
1408 $self->update; 1610 $self->realloc;
1409 $self->check_size;
1410} 1611}
1411 1612
1412sub _draw { 1613sub _draw {
1413 my ($self) = @_; 1614 my ($self) = @_;
1414 1615
… …
1416 1617
1417 my $tex = $self->{texture} ||= do { 1618 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1619 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1620 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1625
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1424 1628
1629 unless (exists $self->{ox}) {
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1428 1633
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1434 }; 1637 };
1435 1638
1436 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1438 1641
1642 glColor_premultiply @{$self->{fg}}
1439 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1440 glColor @{$self->{fg}}; 1644
1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1442 } else {
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1444 }
1445 1646
1446 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1447} 1648}
1448 1649
1449############################################################################# 1650#############################################################################
… …
1464 active_fg => [0, 0, 0], 1665 active_fg => [0, 0, 0],
1465 can_hover => 1, 1666 can_hover => 1,
1466 can_focus => 1, 1667 can_focus => 1,
1467 valign => 0, 1668 valign => 0,
1468 can_events => 1, 1669 can_events => 1,
1670 #text => ...
1469 @_ 1671 @_
1470 ) 1672 )
1471} 1673}
1472 1674
1473sub _set_text { 1675sub _set_text {
… …
1475 1677
1476 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1477 1679
1478 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1479 1681
1480 delete $self->{texture};
1481
1482 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1483 $self->{text} = $text; 1683 $self->{text} = $text;
1484 1684
1485 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1487 1687
1488 $self->emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1489} 1690}
1490 1691
1491sub set_text { 1692sub set_text {
1492 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1493 1694
1494 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1696 $self->_set_text ($text);
1496 $self->update; 1697
1497 $self->check_size; 1698 $self->realloc;
1498} 1699}
1499 1700
1500sub get_text { 1701sub get_text {
1501 $_[0]{text} 1702 $_[0]{text}
1502} 1703}
… …
1505 my ($self) = @_; 1706 my ($self) = @_;
1506 1707
1507 my ($w, $h) = $self->SUPER::size_request; 1708 my ($w, $h) = $self->SUPER::size_request;
1508 1709
1509 ($w + 1, $h) # add 1 for cursor 1710 ($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} 1711}
1517 1712
1518sub key_down { 1713sub key_down {
1519 my ($self, $ev) = @_; 1714 my ($self, $ev) = @_;
1520 1715
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1730 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1731 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1732 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1735 $self->_emit ('escape');
1541 } elsif ($uni) { 1736 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1543 } 1740 }
1544 1741
1545 $self->_set_text ($text); 1742 $self->_set_text ($text);
1546 $self->update; 1743
1547 $self->check_size; 1744 $self->realloc;
1745
1746 1
1548} 1747}
1549 1748
1550sub focus_in { 1749sub focus_in {
1551 my ($self) = @_; 1750 my ($self) = @_;
1552 1751
… …
1567 utf8::encode $text; 1766 utf8::encode $text;
1568 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1569 1768
1570 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1571 $self->update; 1770 $self->update;
1771
1772 1
1572} 1773}
1573 1774
1574sub mouse_motion { 1775sub mouse_motion {
1575 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1576# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1577} 1780}
1578 1781
1579sub _draw { 1782sub _draw {
1580 my ($self) = @_; 1783 my ($self) = @_;
1581 1784
1582 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1583 1786
1584 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1585 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1586 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1587 } else { 1790 } else {
1588 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1589 } 1792 }
1590 1793
1591 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1592 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1593 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1594 glVertex 0 , 0; 1797 glVertex 0 , 0;
1595 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1596 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1597 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1632 if ($sym == 13) { 1835 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1836 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1837 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1838 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1839 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1840 $self->_emit (activate => $txt);
1638 $self->update; 1841 $self->update;
1639 1842
1640 } elsif ($sym == CFClient::SDLK_UP) { 1843 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1844 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1845 $self->{history_saveback} = $self->get_text;
… …
1658 } else { 1861 } else {
1659 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1660 } 1863 }
1661 1864
1662 } else { 1865 } else {
1663 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1664 } 1869 1
1665
1666} 1870}
1667 1871
1668############################################################################# 1872#############################################################################
1669 1873
1670package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1679 1883
1680sub new { 1884sub new {
1681 my $class = shift; 1885 my $class = shift;
1682 1886
1683 $class->SUPER::new ( 1887 $class->SUPER::new (
1684 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1685 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1687 can_hover => 1, 1892 can_hover => 1,
1688 align => 0, 1893 align => 0,
1689 valign => 0, 1894 valign => 0,
1690 can_events => 1, 1895 can_events => 1,
1691 @_ 1896 @_
1692 ) 1897 )
1693} 1898}
1694 1899
1900sub activate { }
1901
1695sub button_up { 1902sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1697 1904
1905 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1907 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate"); 1908
1701 } 1909 1
1702} 1910}
1703 1911
1704sub _draw { 1912sub _draw {
1705 my ($self) = @_; 1913 my ($self) = @_;
1706 1914
1707 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1708
1709 if ($GRAB == $self) {
1710 $self->{fg} = $self->{active_fg};
1711 }
1712 1916
1713 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1715 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1716 1920
… …
1735 1939
1736sub new { 1940sub new {
1737 my $class = shift; 1941 my $class = shift;
1738 1942
1739 $class->SUPER::new ( 1943 $class->SUPER::new (
1740 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1741 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1950 state => 0,
… …
1749} 1954}
1750 1955
1751sub size_request { 1956sub size_request {
1752 my ($self) = @_; 1957 my ($self) = @_;
1753 1958
1754 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1755} 1960}
1756 1961
1757sub button_down { 1962sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1759 1964
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1764 } 1973 1
1765} 1974}
1766 1975
1767sub _draw { 1976sub _draw {
1768 my ($self) = @_; 1977 my ($self) = @_;
1769 1978
1770 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1771 1980
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1982
1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1983 my ($w, $h) = @$self{qw(w h)};
1984
1985 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1775 1986
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 1988
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 1990
… …
1934 2145
1935 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
1936 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
1937 2148
1938 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
1939 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1940 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
1941 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1942 2154
1943 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
1944 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2043 my $self = $class->SUPER::new ( 2255 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2260 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2051 vertical => 0, 2263 vertical => 0,
2052 can_hover => 1, 2264 can_hover => 1,
2053 inner_pad => .05, 2265 inner_pad => 0.02,
2054 @_ 2266 @_
2055 ); 2267 );
2056 2268
2057 $self->set_value ($self->{range}[0]); 2269 $self->set_value ($self->{range}[0]);
2058 $self->update; 2270 $self->update;
2059 2271
2060 $self 2272 $self
2061} 2273}
2062 2274
2275sub changed { }
2276
2277sub set_range {
2278 my ($self, $range) = @_;
2279
2280 ($range, $self->{range}) = ($self->{range}, $range);
2281
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}";
2284}
2285
2063sub set_value { 2286sub set_value {
2064 my ($self, $value) = @_; 2287 my ($self, $value) = @_;
2065 2288
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2289 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2290
2068 $hi = $lo + 1 if $hi <= $lo; 2291 $hi = $lo + 1 if $hi <= $lo;
2069 2292
2293 $page = $hi - $lo if $page > $hi - $lo;
2294
2070 $value = $lo if $value < $lo; 2295 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2296 $value = $hi - $page if $value > $hi - $page;
2072 2297
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2298 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2299 if $unit;
2075 2300
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2302
2080 if ($value != $old_value) { 2303 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2304 $self->_emit (changed => $value);
2082 $self->update; 2305 $self->update;
2083 } 2306 }
2084} 2307}
2085 2308
2086sub size_request { 2309sub size_request {
2087 my ($self) = @_; 2310 my ($self) = @_;
2088 2311
2089 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2313}
2094 2314
2095sub button_down { 2315sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2097 2317
2098 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2319
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321
2099 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2100} 2323}
2101 2324
2102sub mouse_motion { 2325sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2104 2327
2105 if ($GRAB == $self) { 2328 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2330
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2332
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2334
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2113 } 2340 1
2114} 2341}
2115 2342
2116sub update { 2343sub update {
2117 my ($self) = @_; 2344 my ($self) = @_;
2118 2345
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2120 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2121 2355
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2357 my $range = ($hi - $page - $lo) || 1e-100;
2123 2358
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2359 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2360
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2361 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2362 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2363
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2364 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2365 $value = $value * $self->{scale} + $self->{offset};
2130 2366
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; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2368 $self->{knob_w} = $knob_w;
2138 }); 2369 }
2139
2140 $self->SUPER::update;
2141}
2142
2143sub _draw {
2144 my ($self) = @_;
2145 2370
2146 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2147 2372
2148 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2149 2374
2150 if ($self->{vertical}) { 2375 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2376 # draw a vertical slider like a rotated horizontal slider
2152 2377
2378 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2379 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2380 }
2156 2381
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2382 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2383 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2384
… …
2166 # draw handle 2391 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2392 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2393
2169 glDisable GL_TEXTURE_2D; 2394 glDisable GL_TEXTURE_2D;
2170} 2395}
2396
2397#############################################################################
2398
2399package CFClient::UI::ValSlider;
2400
2401our @ISA = CFClient::UI::HBox::;
2402
2403sub new {
2404 my ($class, %arg) = @_;
2405
2406 my $range = delete $arg{range};
2407
2408 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift },
2412 from_value => sub { shift },
2413 %arg,
2414 );
2415
2416 $self->{slider}->connect (changed => sub {
2417 my ($self, $value) = @_;
2418 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2419 $self->{parent}->emit (changed => $value);
2420 });
2421
2422# $self->{entry}->connect (changed => sub {
2423# my ($self, $value) = @_;
2424# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2425# $self->{parent}->emit (changed => $value);
2426# });
2427
2428 $self->add ($self->{slider}, $self->{entry});
2429
2430 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2431
2432 $self
2433}
2434
2435sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) }
2171 2437
2172############################################################################# 2438#############################################################################
2173 2439
2174package CFClient::UI::TextView; 2440package CFClient::UI::TextView;
2175 2441
… …
2205 2471
2206 $self->{fontsize} = $fontsize; 2472 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2473 $self->reflow;
2208} 2474}
2209 2475
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 { 2476sub size_allocate {
2230 my ($self, $w, $h) = @_; 2477 my ($self, $w, $h) = @_;
2231 2478
2232 $self->SUPER::size_allocate ($w, $h); 2479 $self->SUPER::size_allocate ($w, $h);
2233 2480
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2483 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2484
2238 $self->reflow; 2485 $self->reflow;
2239} 2486}
2240 2487
2488sub text_size {
2489 my ($self, $text, $indent) = @_;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent);
2495 $layout->set_markup ($text);
2496
2497 $layout->size
2498}
2499
2500sub reflow {
2501 my ($self) = @_;
2502
2503 $self->{need_reflow}++;
2504 $self->update;
2505}
2506
2507sub set_offset {
2508 my ($self, $offset) = @_;
2509
2510 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset);
2512}
2513
2514sub clear {
2515 my ($self) = @_;
2516
2517 $self->{par} = [];
2518 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520}
2521
2241sub add_paragraph { 2522sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2523 my ($self, $color, $text, $indent) = @_;
2243 2524
2244 #TODO: intelligently "reformat" paragraph 2525 for my $line (split /\n/, $text) {
2245 2526 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2527 $self->{height} += $h;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2529 }
2249 2530
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2532}
2255 2533
2256sub update { 2534sub update {
2257 my ($self) = @_; 2535 my ($self) = @_;
2258 2536
… …
2261 return unless $self->{h} > 0; 2539 return unless $self->{h} > 0;
2262 2540
2263 delete $self->{texture}; 2541 delete $self->{texture};
2264 2542
2265 $ROOT->on_post_alloc ($self, sub { 2543 $ROOT->on_post_alloc ($self, sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545
2266 if (delete $self->{need_reflow}) { 2546 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2547 my $height = 0;
2268 2548
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2270 for @{$self->{par}}; 2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2271 2564
2272 $self->{height} = $height; 2565 $self->{height} = $height;
2273 2566
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2568
2276 delete $self->{texture}; 2569 delete $self->{texture};
2277 } 2570 }
2278 2571
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2573 glClearColor 0, 0, 0, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2282 2575
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]; 2576 my $top = int $self->{children}[1]{range}[0];
2287 2577
2288 my $y0 = $top; 2578 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2579 my $y1 = $top + $H;
2290 2580
2291 my $y = 0; 2581 my $y = 0;
2292 2582
2293 my $layout = $self->{layout}; 2583 my $layout = $self->{layout};
2294 2584
2295 $layout->set_font ($self->{font}) if $self->{font}; 2585 $layout->set_font ($self->{font}) if $self->{font};
2296 2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2297 for my $par (@{$self->{par}}) { 2591 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2592 my $h = $par->[1];
2299 2593
2300 if ($y0 < $y + $h && $y < $y1) { 2594 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2597 $layout->set_markup ($par->[4]);
2303 2598
2304 my ($W, $H) = $layout->size; 2599 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2600
2601 glRasterPos $par->[3], $y - $y0;
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2603 }
2307 2604
2308 $y += $h; 2605 $y += $h;
2309 } 2606 }
2310 2607
2311 glDisable GL_TEXTURE_2D; 2608 glDisable GL_BLEND;
2312 }; 2609 };
2313 }); 2610 });
2314} 2611}
2315 2612
2316sub _draw { 2613sub _draw {
2317 my ($self) = @_; 2614 my ($self) = @_;
2318 2615
2319 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2324 2621
2325 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2326 2623
… …
2376 2673
2377sub new { 2674sub new {
2378 my $class = shift; 2675 my $class = shift;
2379 2676
2380 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2381 state => 0, 2678 state => 0,
2382 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2383 @_ 2680 @_
2384 ); 2681 );
2385 2682
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2683 $self
2392} 2684}
2393 2685
2394sub toggle_flopper { 2686sub toggle_flopper {
2395 my ($self) = @_; 2687 my ($self) = @_;
2396 2688
2397 # TODO: use animation 2689 $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} 2690}
2409 2691
2410############################################################################# 2692#############################################################################
2411 2693
2412package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2425} 2707}
2426 2708
2427sub set_tooltip_from { 2709sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2429 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2430 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2724 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2726 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2728 );
2437} 2729}
2438 2730
2439sub size_request { 2731sub size_request {
2440 my ($self) = @_; 2732 my ($self) = @_;
… …
2446 2738
2447sub size_allocate { 2739sub size_allocate {
2448 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2449 2741
2450 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2451} 2761}
2452 2762
2453sub _draw { 2763sub _draw {
2454 my ($self) = @_; 2764 my ($self) = @_;
2455 2765
… …
2472 glVertex $w, $h; 2782 glVertex $w, $h;
2473 glVertex $w, 0; 2783 glVertex $w, 0;
2474 glEnd; 2784 glEnd;
2475 2785
2476 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2477 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2478} 2789}
2479 2790
2480############################################################################# 2791#############################################################################
2481 2792
… …
2486use CFClient::OpenGL; 2797use CFClient::OpenGL;
2487 2798
2488sub new { 2799sub new {
2489 my $class = shift; 2800 my $class = shift;
2490 2801
2491 $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2492 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2493 @_, 2805 @_,
2494 ) 2806 );
2807
2808 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self);
2810
2811 $self->{timer} = Event->timer (
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2813 hard => 1,
2814 interval => $self->{animspeed},
2815 cb => sub {
2816 ++$widget->{frame};
2817 $widget->update;
2818 },
2819 );
2820 }
2821
2822 $self
2495} 2823}
2496 2824
2497sub size_request { 2825sub size_request {
2498 (32, 8) 2826 (32, 8)
2499} 2827}
2500 2828
2829sub update {
2830 my ($self) = @_;
2831
2832 return unless $self->{visible};
2833
2834 $self->SUPER::update;
2835}
2836
2501sub _draw { 2837sub _draw {
2502 my ($self) = @_; 2838 my ($self) = @_;
2503 2839
2504 return unless $::CONN;#d# manage and cache textures differently 2840 return unless $::CONN;
2841
2842 my $face;
2843
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}];
2846
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2852
2507 # TODO animation
2508 if ($tex) { 2853 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2514 } 2859 }
2515} 2860}
2516 2861
2862sub DESTROY {
2863 my ($self) = @_;
2864
2865 $self->{timer}->cancel
2866 if $self->{timer};
2867
2868 $self->SUPER::DESTROY;
2869}
2870
2517############################################################################# 2871#############################################################################
2518 2872
2519package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2520 2874
2521our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2522 2876
2523sub new { 2877# 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 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2560 } elsif ($ev->{button} == 2) {
2561 $::CONN->send ("apply $item->{tag}");
2562 } elsif ($ev->{button} == 3) {
2563 my @menu_items = (
2564 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2565 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2566 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2567 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2568 [
2569 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2570 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2571 ],
2572 );
2573
2574 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2575 }
2576
2577 1
2578 },
2579 %args
2580 );
2581
2582 $self->add (new CFClient::UI::Face
2583 can_events => 0,
2584 face => $item->{face},
2585 anim => $item->{anim},
2586 animspeed => $item->{animspeed},
2587 );
2588
2589 $self->add (new CFClient::UI::Label
2590 can_events => 0,
2591 text => $desc,
2592 );
2593
2594 $self
2595}
2596
2597#############################################################################
2598
2599package CFClient::UI::Inventory;
2600
2601our @ISA = CFClient::UI::ScrolledWindow::;
2602
2603sub new {
2604 my $class = shift;
2605
2606 my $self = $class->SUPER::new (
2607 scrolled => (new CFClient::UI::VBox),
2608 @_,
2609 );
2610
2611 $self
2612}
2613
2614sub set_items {
2615 my ($self, $items) = @_;
2616
2617 $self->{scrolled}->clear;
2618 return unless $items;
2619
2620 my @items = sort {
2621 ($a->{type} <=> $b->{type})
2622 or ($a->{name} cmp $b->{name})
2623 } @$items;
2624
2625 $self->{real_items} = \@items;
2626
2627 for my $item (@items) {
2628 my $desc = $item->{nrof} < 2
2629 ? $item->{name}
2630 : "$item->{nrof} $item->{name_pl}";
2631
2632 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2633 }
2634
2635 $self->{scrolled}->add (@items);
2636
2637# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2638}
2639
2640sub size_request {
2641 my ($self) = @_;
2642 ($self->{req_w}, $self->{req_h});
2643}
2644 2878
2645############################################################################# 2879#############################################################################
2646 2880
2647package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2648 2882
… …
2682 2916
2683# popup given the event (must be a mouse button down event currently) 2917# popup given the event (must be a mouse button down event currently)
2684sub popup { 2918sub popup {
2685 my ($self, $ev) = @_; 2919 my ($self, $ev) = @_;
2686 2920
2687 $self->emit ("popdown"); 2921 $self->_emit ("popdown");
2688 2922
2689 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2690 $GRAB = $self; 2924 $GRAB = $self;
2691 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2692 2926
2693 $self->show; 2927 $self->show;
2694 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2695} 2929}
2696 2930
2697sub mouse_motion { 2931sub mouse_motion {
2698 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2699 2933
2700 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2701 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2702 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2703} 2939}
2704 2940
2705sub button_up { 2941sub button_up {
2706 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2707 2943
2708 if ($ev->{button} == $self->{button}) { 2944 if ($ev->{button} == $self->{button}) {
2709 undef $GRAB; 2945 undef $GRAB;
2710 $self->hide; 2946 $self->hide;
2711 2947
2712 $self->emit ("popdown"); 2948 $self->_emit ("popdown");
2713 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2714 } 2954 1
2715} 2955}
2716 2956
2717############################################################################# 2957#############################################################################
2718 2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
2719package CFClient::UI::Statusbox; 3067package CFClient::UI::Statusbox;
2720 3068
2721our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::VBox::;
2722 3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
3075 fontsize => 0.8,
3076 @_,
3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
3087}
3088
2723sub reorder { 3089sub reorder {
2724 my ($self) = @_; 3090 my ($self) = @_;
2725 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2726 3092
2727 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2728 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2729 } 3095 }
2730 3096
… …
2732 3098
2733 my @items = sort { 3099 my @items = sort {
2734 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2735 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2736 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2737 3105
2738 my $count = 10 + 1; 3106 my $count = 10 + 1;
2739 for my $item (@items) { 3107 for my $item (@items) {
2740 last unless --$count; 3108 last unless --$count;
2741 3109
… …
2746 : $item->{text}; 3114 : $item->{text};
2747 3115
2748 for ($short) { 3116 for ($short) {
2749 s/^\s+//; 3117 s/^\s+//;
2750 s/\s+/ /g; 3118 s/\s+/ /g;
2751 my $len = int 40 / $item->{fontsize};
2752 substr $_, $len, length, "…" if $len < length;
2753 } 3119 }
2754 3120
2755 new CFClient::UI::Label 3121 new CFClient::UI::Label
2756 markup => $short, 3122 markup => $short,
2757 tooltip => $item->{tooltip}, 3123 tooltip => $item->{tooltip},
2758 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2759 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2760 fontsize => $item->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44,
2761 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2762 can_events => 1, 3130 can_events => 1,
2763 can_hover => 1 3131 can_hover => 1
2764 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
2765 } 3143 }
2766 3144
2767 $self->clear; 3145 $self->clear;
2768 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2769} 3147}
… …
2772 my ($self, $text, %arg) = @_; 3150 my ($self, $text, %arg) = @_;
2773 3151
2774 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2775 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2776 3154
3155 return unless $text;
3156
2777 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2778 3158
2779 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2780 3160
2781 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2782 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
2792 $self->{item}{$group} = { 3172 $self->{item}{$group} = {
2793 id => ++$self->{id}, 3173 id => ++$self->{id},
2794 text => $text, 3174 text => $text,
2795 timeout => $timeout, 3175 timeout => $timeout,
2796 tooltip => $text, 3176 tooltip => $text,
2797 fontsize => 0.8,
2798 fg => [0.8, 0.8, 0.8, 0.8], 3177 fg => [0.8, 0.8, 0.8, 0.8],
2799 pri => 0, 3178 pri => 0,
2800 count => 1, 3179 count => 1,
2801 %arg, 3180 %arg,
2802 }; 3181 };
2803 } 3182 }
2804 3183
2805 $self->reorder; 3184 $self->reorder;
2806} 3185}
2807 3186
3187sub reconfigure {
3188 my ($self) = @_;
3189
3190 delete $_->{label}
3191 for values %{ $self->{item} || {} };
3192
3193 $self->reorder;
3194 $self->SUPER::reconfigure;
3195}
3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
2808############################################################################# 3205#############################################################################
2809 3206
2810package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
2811 3208
2812our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
2813
2814use CFClient::OpenGL;
2815 3210
2816sub new { 3211sub new {
2817 my $class = shift; 3212 my $class = shift;
2818 3213
2819 $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216 @_,
3217 );
3218
3219 $self
3220}
3221
3222sub set_items {
3223 my ($self, $items) = @_;
3224
3225 $self->{child}->clear;
3226 return unless $items;
3227
3228 my @items = sort {
3229 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name})
3231 } @$items;
3232
3233 $self->{real_items} = \@items;
3234
3235 my $row = 0;
3236 for my $item (@items) {
3237 CFClient::Item::update_widgets $item;
3238
3239 $self->{child}->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget});
3242
3243 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 }
3442}
3443
3444#############################################################################
3445
3446package CFClient::UI::SpellList;
3447
3448our @ISA = CFClient::UI::Table::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 binding => [],
3455 commands => [],
2820 @_, 3456 @_,
2821 ) 3457 )
2822} 3458}
2823 3459
2824sub configure { 3460# XXX: Do sorting? Argl...
2825 my ($self, $x, $y, $w, $h) = @_; 3461sub add_spell {
2826
2827 $self->{w} = $w;
2828 $self->{h} = $h;
2829}
2830
2831sub check_size {
2832 my ($self) = @_; 3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
2833 3464
2834 $self->size_allocate ($self->{w}, $self->{h}) 3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2835 if $self->{w}; 3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492}
3493
3494sub remove_spell {
3495 my ($self, $spell) = @_;
3496 delete $self->{spells}->{$spell->{name}};
3497 $self->rebuild_spell_list;
3498}
3499
3500#############################################################################
3501
3502package CFClient::UI::Root;
3503
3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3507
3508use CFClient::OpenGL;
3509
3510sub new {
3511 my $class = shift;
3512
3513 my $self = $class->SUPER::new (
3514 visible => 1,
3515 @_,
3516 );
3517
3518 Scalar::Util::weaken ($self->{root} = $self);
3519
3520 $self
2836} 3521}
2837 3522
2838sub size_request { 3523sub size_request {
2839 my ($self) = @_; 3524 my ($self) = @_;
2840 3525
2841 ($self->{w}, $self->{h}) 3526 ($self->{w}, $self->{h})
3527}
3528
3529sub _to_pixel {
3530 my ($coord, $size, $max) = @_;
3531
3532 $coord =
3533 $coord eq "center" ? ($max - $size) * 0.5
3534 : $coord eq "max" ? $max
3535 : $coord;
3536
3537 $coord = 0 if $coord < 0;
3538 $coord = $max - $size if $coord > $max - $size;
3539
3540 int $coord + 0.5
2842} 3541}
2843 3542
2844sub size_allocate { 3543sub size_allocate {
2845 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
2846 3545
2847 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2848 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2849
2850 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2851 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2852
2853 for my $child ($self->children) { 3546 for my $child ($self->children) {
2854 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2855 3548
2856 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
2857 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
2858 3551
2859 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
2860 if exists $child->{req_y}; 3553 $Y = _to_pixel $Y, $H, $self->{h};
2861
2862 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2863 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2864 3554
2865 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
2866 } 3556 }
2867} 3557}
2868 3558
… …
2879} 3569}
2880 3570
2881sub update { 3571sub update {
2882 my ($self) = @_; 3572 my ($self) = @_;
2883 3573
2884 $self->check_size;
2885 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
2886} 3575}
2887 3576
2888sub add { 3577sub add {
2889 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
2890 3579
2891 for my $child (@children) {
2892 $child->{toplevel} = 1; 3580 $_->{is_toplevel} = 1
2893 3581 for @children;
2894 # integerise window positions
2895 $child->{x} = int $child->{x};
2896 $child->{y} = int $child->{y};
2897 }
2898 3582
2899 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3584}
3585
3586sub remove {
3587 my ($self, @children) = @_;
3588
3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3593
3594 while (@children) {
3595 my $w = pop @children;
3596 push @children, $w->children;
3597 $w->set_invisible;
3598 }
2900} 3599}
2901 3600
2902sub on_refresh { 3601sub on_refresh {
2903 my ($self, $id, $cb) = @_; 3602 my ($self, $id, $cb) = @_;
2904 3603
… …
2917 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
2918 $_->() 3617 $_->()
2919 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
2920 } 3619 }
2921 3620
2922 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
2923 my @queue = ([], []); 3622 my %queue;
3623 my @queue;
3624 my $widget;
2924 3625
2925 for (;;) { 3626 outer:
2926 if ($self->{check_size}) { 3627 while () {
2927 # heuristic: check containers last 3628 if (my $realloc = delete $self->{realloc}) {
2928 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3629 for $widget (values %$realloc) {
2929 for values %{delete $self->{check_size}} 3630 $widget->{visible} or next; # do not resize invisible widgets
3631
3632 $queue{$widget+0}++ and next; # duplicates are common
3633
3634 push @{ $queue[$widget->{visible}] }, $widget;
3635 }
2930 } 3636 }
2931 3637
2932 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3638 while () {
3639 @queue or last outer;
2933 3640
2934 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3641 $widget = pop @{ $queue[-1] || [] }
2935 ? @$widget{qw(user_w user_h)} 3642 and last;
2936 : $widget->size_request;
2937
2938 if (delete $widget->{force_alloc}
2939 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2940 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2941 3643
3644 pop @queue;
3645 }
3646
3647 delete $queue{$widget+0};
3648
3649 my ($w, $h) = $widget->size_request;
3650
3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656
3657 $w = $widget->{force_w} if exists $widget->{force_w};
3658 $h = $widget->{force_h} if exists $widget->{force_h};
3659
3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3661 || delete $widget->{force_realloc}) {
2942 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
2943 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
2944 3664
2945 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
2946 3666
2947 $widget->{parent}->check_size
2948 if $widget->{parent}; 3667 if (my $parent = $widget->{parent}) {
3668 $self->{realloc}{$parent+0} = $parent
3669 unless $queue{$parent+0};
3670
3671 $parent->{force_size_alloc} = 1;
3672 $self->{size_alloc}{$parent+0} = $parent;
3673 }
2949 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
2950 } 3677 }
2951 } 3678 }
2952 3679
2953 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
2954 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
2955 my ($widget, $w, $h) = @$_; 3682 values %$size_alloc;
3683
3684 while () {
3685 my $widget = pop @queue || last;
3686
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2956 3688
2957 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
2958 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
2959 3691
3692 $w = int $w + 0.5;
3693 $h = int $h + 0.5;
3694
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w};
3697 $widget->{old_h} = $widget->{h};
3698
2960 $widget->{w} = $w; 3699 $widget->{w} = $w;
2961 $widget->{h} = $h; 3700 $widget->{h} = $h;
2962 $widget->size_allocate ($w, $h); 3701
2963 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
2964 } 3704 }
2965 } 3705 }
2966 3706
2967 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
2968 $_->() 3708 $_->()
2969 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
2970 } 3710 }
2971 3711
3712
2972 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2973 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2974 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
2975 3716
2976 glMatrixMode GL_PROJECTION; 3717 glMatrixMode GL_PROJECTION;
2977 glLoadIdentity; 3718 glLoadIdentity;
2978 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2979 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
2980 glLoadIdentity; 3721 glLoadIdentity;
2981 3722
3723 {
3724 package CFClient::UI::Base;
3725
3726 ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h});
3728 }
3729
2982 $self->_draw; 3730 $self->_draw;
2983} 3731}
2984 3732
2985############################################################################# 3733#############################################################################
2986 3734
2987package CFClient::UI; 3735package CFClient::UI;
2988 3736
2989$ROOT = new CFClient::UI::Root; 3737$ROOT = new CFClient::UI::Root;
2990$TOOLTIP = new CFClient::UI::Tooltip; 3738$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2991 3739
29921 37401
2993 3741

Diff Legend

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