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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 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
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
17sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
18 if (!$GRAB) { 47 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
23 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
24 54
25 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
26 56
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 58
29 $TOOLTIP->set_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 60 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
40 } 61 }
41 62
42 return; 63 return;
43 } 64 }
44 } 65 }
… …
48 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
49} 70}
50 71
51# class methods for events 72# class methods for events
52sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
54 if $FOCUS; 75 if $FOCUS;
55} 76}
56 77
57sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
59 if $FOCUS; 80 if $FOCUS;
60} 81}
61 82
62sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
63 my ($ev) = @_; 84 my ($ev) = @_;
… …
72 check_tooltip; 93 check_tooltip;
73 } 94 }
74 95
75 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
76 97
77 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
81} 100}
82 101
83sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
84 my ($ev) = @_; 103 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
86 105
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88 107
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 109
91 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
95 112
96 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
97 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
98 $grab->update if $grab; 115 $grab->update if $grab;
99 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
115 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
116 133
117 check_tooltip; 134 check_tooltip;
118 } 135 }
119 136
120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123 } 138 if $HOVER;
124} 139}
125 140
126# convert position array to integers 141# convert position array to integers
127sub harmonize { 142sub harmonize {
128 my ($vals) = @_; 143 my ($vals) = @_;
… …
134 $rem += $_ - $i; 149 $rem += $_ - $i;
135 $_ = $i; 150 $_ = $i;
136 } 151 }
137} 152}
138 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
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
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
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_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
189 }
190 }
191
192 reconfigure_widgets;
193}
194
139############################################################################# 195#############################################################################
140 196
141package CFClient::UI::Base; 197package CFClient::UI::Base;
142 198
143use strict; 199use strict;
… …
146 202
147sub new { 203sub new {
148 my $class = shift; 204 my $class = shift;
149 205
150 my $self = bless { 206 my $self = bless {
151 x => 0, 207 x => "center",
152 y => 0, 208 y => "center",
153 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
154 can_events => 1, 212 can_events => 1,
155 @_ 213 @_
156 }, $class; 214 }, $class;
157 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
158 for (keys %$self) { 218 for (keys %$self) {
159 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
161 } 221 }
162 } 222 }
163 223
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 }
235
164 $self 236 $self
165} 237}
166 238
167sub destroy { 239sub destroy {
168 my ($self) = @_; 240 my ($self) = @_;
… …
177 return if $self->{parent}; 249 return if $self->{parent};
178 250
179 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
180} 252}
181 253
182sub hide { 254sub set_visible {
183 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};
184 278
185 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
187 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
188 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
189 if $self->{parent}; 313 if $self->{parent};
190} 314}
191 315
192sub move { 316sub move_abs {
193 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
194 318
195 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
196 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
197 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
198 322
199 $self->update; 323 $self->update;
200} 324}
201 325
202sub set_size { 326sub set_size {
203 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
204 328
205 $self->{user_w} = $w; 329 $self->{force_w} = $w;
206 $self->{user_h} = $h; 330 $self->{force_h} = $h;
207 331
208 $self->check_size; 332 $self->realloc;
209} 333}
210 334
211sub size_request { 335sub size_request {
212 require Carp; 336 require Carp;
213 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
215 339
216sub configure { 340sub configure {
217 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
218 342
219 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
220 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
221 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
222 348
223 # use alignment to adjust x, y 349 # use alignment to adjust x, y
224 350
225 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
226 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
227
228 ($w, $h) = ($w2, $h2);
229 } 353 }
230 354
231 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
232 $self->{x} = $x; 356 $self->{x} = $x;
233 $self->{y} = $y; 357 $self->{y} = $y;
234 $self->update; 358 $self->update;
235 } 359 }
236 360
237 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
238 $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;
239 } 368 }
240} 369}
241 370
242sub size_allocate { 371sub size_allocate {
243 # nothing to be done 372 # nothing to be done
244} 373}
245 374
246sub children { 375sub children {
247} 376}
248 377
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259}
260
261sub set_max_size { 378sub set_max_size {
262 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
263 380
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
383}
384
385sub set_tooltip {
386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
266} 399}
267 400
268# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
269sub coord2local { 402sub coord2local {
270 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 418 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
287 420
288 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
289 422
290 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
291 424
292 $focus->update if $focus; 425 $focus->update if $focus;
293 $FOCUS->update; 426 $FOCUS->update;
294} 427}
295 428
… …
298 431
299 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
300 433
301 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
302 435
303 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
304 437
305 $focus->update if $focus; #? 438 $focus->update if $focus; #?
306}
307 439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
442}
443
308sub mouse_motion { } 444sub mouse_motion { 0 }
309sub button_up { } 445sub button_up { 0 }
310sub key_down { } 446sub key_down { 0 }
311sub key_up { } 447sub key_up { 0 }
312 448
313sub button_down { 449sub button_down {
314 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
315 451
316 $self->focus_in; 452 $self->focus_in;
317}
318 453
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
323sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
324 530
325sub draw { 531sub draw {
326 my ($self) = @_; 532 my ($self) = @_;
327 533
328 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
329 545
330 glPushMatrix; 546 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw; 548 $self->_draw;
333 glPopMatrix; 549 glPopMatrix;
… …
345 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
346 glEnd; 562 glEnd;
347 glDisable GL_BLEND; 563 glDisable GL_BLEND;
348 } 564 }
349 565
350 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
351 glPushMatrix; 567 glPushMatrix;
352 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 571 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 572 glVertex $self->{w} - 1, 0;
357 glVertex $self->{w}, $self->{h}; 573 glVertex $self->{w} - 1, $self->{h} - 1;
358 glVertex 0 , $self->{h}; 574 glVertex 0 , $self->{h} - 1;
359 glEnd; 575 glEnd;
360 glPopMatrix; 576 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 578 }
363} 579}
364 580
365sub _draw { 581sub _draw {
366 my ($self) = @_; 582 my ($self) = @_;
367 583
368 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
369} 585}
370 586
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
390}
391
392sub check_size {
393 my ($self) = @_;
394
395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396}
397
398sub update {
399 my ($self) = @_;
400
401 $self->{parent}->update
402 if $self->{parent};
403}
404
405sub connect {
406 my ($self, $signal, $cb) = @_;
407
408 push @{ $self->{signal_cb}{$signal} }, $cb;
409}
410
411sub emit {
412 my ($self, $signal, @args) = @_;
413
414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
415}
416
417sub DESTROY { 587sub DESTROY {
418 my ($self) = @_; 588 my ($self) = @_;
419 589
590 delete $WIDGET{$self+0};
420 #$self->deactivate; 591 #$self->deactivate;
421} 592}
422 593
423############################################################################# 594#############################################################################
424 595
… …
433 my $class = shift; 604 my $class = shift;
434 605
435 # range [value, low, high, page] 606 # range [value, low, high, page]
436 607
437 $class->SUPER::new ( 608 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 609 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 610 #active_bg => [1, 1, 1, 0.5],
440 @_ 611 @_
441 ) 612 )
442} 613}
443 614
444sub _draw { 615sub _draw {
445 my ($self) = @_; 616 my ($self) = @_;
446 617
618 my $color = $FOCUS == $self && $self->{active_bg}
619 ? $self->{active_bg}
620 : $self->{bg};
621
622 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 623 my ($w, $h) = @$self{qw(w h)};
448 624
449 glEnable GL_BLEND; 625 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 627 glColor @$color;
452 628
453 glBegin GL_QUADS; 629 glBegin GL_QUADS;
454 glVertex 0 , 0; 630 glVertex 0 , 0;
455 glVertex 0 , $h; 631 glVertex 0 , $h;
456 glVertex $w, $h; 632 glVertex $w, $h;
457 glVertex $w, 0; 633 glVertex $w, 0;
458 glEnd; 634 glEnd;
459 635
460 glDisable GL_BLEND; 636 glDisable GL_BLEND;
637 }
461} 638}
462 639
463############################################################################# 640#############################################################################
464 641
465package CFClient::UI::Empty; 642package CFClient::UI::Empty;
… …
470 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
471 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
472} 649}
473 650
474sub size_request { 651sub size_request {
475 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
476} 655}
477 656
478sub draw { } 657sub draw { }
479 658
480############################################################################# 659#############################################################################
… …
509 $self->{children} = [ 688 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
512 ]; 691 ];
513 692
514 $self->check_size; 693 $self->realloc;
515 $self->update;
516} 694}
517 695
518sub children { 696sub children {
519 @{ $_[0]{children} } 697 @{ $_[0]{children} }
520} 698}
… …
525 delete $child->{parent}; 703 delete $child->{parent};
526 $child->hide; 704 $child->hide;
527 705
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 707
530 $self->check_size; 708 $self->realloc;
531 $self->update;
532} 709}
533 710
534sub clear { 711sub clear {
535 my ($self) = @_; 712 my ($self) = @_;
536 713
… …
540 for (@$children) { 717 for (@$children) {
541 delete $_->{parent}; 718 delete $_->{parent};
542 $_->hide; 719 $_->hide;
543 } 720 }
544 721
545 $self->check_size; 722 $self->realloc;
546 $self->update;
547} 723}
548 724
549sub find_widget { 725sub find_widget {
550 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
551 727
… …
626} 802}
627 803
628sub update { 804sub update {
629 my ($self) = @_; 805 my ($self) = @_;
630 806
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 807 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 808 $self->SUPER::update;
633} 809}
634 810
635sub size_allocate { 811sub size_allocate {
636 my ($self, $w, $h) = @_; 812 my ($self, $w, $h) = @_;
… …
638 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
639 $self->update; 815 $self->update;
640} 816}
641 817
642sub _render { 818sub _render {
819 my ($self) = @_;
820
643 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
644} 822}
645 823
646sub render_child { 824sub render_child {
647 my ($self) = @_; 825 my ($self) = @_;
648 826
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 827 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
652 830
831 {
832 package CFClient::UI::Base;
833
834 ($draw_x, $draw_y, $draw_w, $draw_h) =
835 (0, 0, $self->{w}, $self->{h});
836 }
837
653 $self->_render; 838 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 }; 839 };
662} 840}
663 841
664sub _draw { 842sub _draw {
665 my ($self) = @_; 843 my ($self) = @_;
666 844
667 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
668 846
669 my $tex = $self->{texture} 847 my $tex = $self->{texture}
670 or return; 848 or return;
671 849
672 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1; 852 glColor 1, 1, 1, 1;
675 853
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677 855
678 glDisable GL_TEXTURE_2D; 856 glDisable GL_TEXTURE_2D;
679} 857}
… …
682 860
683package CFClient::UI::ViewPort; 861package CFClient::UI::ViewPort;
684 862
685our @ISA = CFClient::UI::Window::; 863our @ISA = CFClient::UI::Window::;
686 864
865sub new {
866 my $class = shift;
867
868 $class->SUPER::new (
869 scroll_x => 0,
870 scroll_y => 1,
871 @_,
872 )
873}
874
687sub size_request { 875sub size_request {
688 my ($self) = @_; 876 my ($self) = @_;
689 877
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692 879
693 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
694} 884}
695 885
696sub size_allocate { 886sub size_allocate {
697 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
698 888
889 my $child = $self->child;
890
891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
893
894 $self->child->configure (0, 0, $w, $h);
699 $self->update; 895 $self->update;
700} 896}
701 897
702sub set_offset { 898sub set_offset {
703 my ($self, $x, $y) = @_; 899 my ($self, $x, $y) = @_;
… …
737} 933}
738 934
739sub _render { 935sub _render {
740 my ($self) = @_; 936 my ($self) = @_;
741 937
938 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
939 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
940
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743 942
744 $self->SUPER::_render; 943 $self->SUPER::_render;
745} 944}
746 945
… …
754 my $class = shift; 953 my $class = shift;
755 954
756 my $self; 955 my $self;
757 956
758 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
759 vertical => 1, 958 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub { 960 on_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 961 $self->{vp}->set_offset (0, $_[1]);
763 }, 962 },
764 ; 963 ;
765 964
766 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 966 vp => (new CFClient::UI::ViewPort expand => 1),
768 slider => $slider, 967 slider => $slider,
769 @_, 968 @_,
770 ); 969 );
771 970
772 $self->{vp}->add ($self->{scrolled}); 971 $self->{vp}->add ($self->{scrolled});
… …
774 $self->add ($self->{slider}); 973 $self->add ($self->{slider});
775 974
776 $self 975 $self
777} 976}
778 977
978sub update {
979 my ($self) = @_;
980
981 $self->SUPER::update;
982
983 # todo: overwrite size_allocate of child
984 my $child = $self->{vp}->child;
985 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
986}
987
988sub size_allocate {
989 my ($self, $w, $h) = @_;
990
991 $self->SUPER::size_allocate ($w, $h);
992
993 my $child = $self->{vp}->child;
994 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
995}
996
779#TODO# update range on size_allocate depeneing on child 997#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 998# update viewport offset on scroll
781 999
782############################################################################# 1000#############################################################################
783 1001
784package CFClient::UI::Frame; 1002package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 1006use CFClient::OpenGL;
789 1007
790sub new { 1008sub new {
791 my $class = shift; 1009 my $class = shift;
792 1010
1011 $class->SUPER::new (
1012 bg => undef,
1013 @_,
1014 )
1015}
1016
1017sub _draw {
1018 my ($self) = @_;
1019
1020 if ($self->{bg}) {
1021 my ($w, $h) = @$self{qw(w h)};
1022
1023 glEnable GL_BLEND;
1024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1025 glColor @{ $self->{bg} };
1026
1027 glBegin GL_QUADS;
1028 glVertex 0 , 0;
1029 glVertex 0 , $h;
1030 glVertex $w, $h;
1031 glVertex $w, 0;
1032 glEnd;
1033
1034 glDisable GL_BLEND;
1035 }
1036
1037 $self->SUPER::_draw;
1038}
1039
1040#############################################################################
1041
1042package CFClient::UI::FancyFrame;
1043
1044our @ISA = CFClient::UI::Bin::;
1045
1046use CFClient::OpenGL;
1047
1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1055
1056sub new {
1057 my ($class, %arg) = @_;
1058
1059 my $title = delete $arg{title};
1060
793 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
794 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
795 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
796 border => 0.8, 1064 border => 0.6,
797 @_ 1065 can_events => 1,
1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
798 ); 1069 );
799 1070
800 $self
801}
802
803sub _draw {
804 my ($self) = @_;
805
806 my ($w, $h) = ($self->{w}, $self->{h});
807
808 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D;
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812
813# glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0;
816# glVertex 0 , $h;
817# glVertex $w, $h;
818# glVertex $w, 0;
819# glEnd;
820
821
822 $self->child->draw;
823 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D;
825}
826
827#############################################################################
828
829package CFClient::UI::FancyFrame;
830
831our @ISA = CFClient::UI::Bin::;
832
833use CFClient::OpenGL;
834
835my @tex =
836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
838
839sub new {
840 my $class = shift;
841
842 # TODO: user_x, user_y, overwrite moveto?
843
844 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1],
847 border => 0.6,
848 can_events => 1,
849 @_
850 );
851
852 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
853 align => 0, 1072 align => 0,
854 valign => 1, 1073 valign => 1,
855 text => $self->{title}, 1074 text => $title,
856 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
857 1077
858 $self 1078 $self
1079}
1080
1081sub add {
1082 my ($self, @widgets) = @_;
1083
1084 $self->SUPER::add (@widgets);
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
859} 1086}
860 1087
861sub border { 1088sub border {
862 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
863} 1090}
864 1091
865sub size_request { 1092sub size_request {
866 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
867 1097
868 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
869 1099
870 ( 1100 (
871 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
874} 1104}
875 1105
876sub size_allocate { 1106sub size_allocate {
877 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
878 1108
1109 if ($self->{title}) {
1110 $self->{title}{w} = $w;
1111 $self->{title}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h);
1113 }
1114
1115 my $border = $self->border;
1116
879 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
881 1119
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
883 if $self->{title};
884
885 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
886} 1121}
887 1122
888sub button_down { 1123sub button_down {
889 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
890 1125
… …
906 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
907 1142
908 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
910 1145
911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
914 $self->check_size;
915 }; 1151 };
916 1152
917 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
918 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
919 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
… …
921 $self->{motion} = sub { 1157 $self->{motion} = sub {
922 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
923 1159
924 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
925 1161
926 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
927 $self->update;
928 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
929 } 1168 1
930} 1169}
931 1170
932sub button_up { 1171sub button_up {
933 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
934 1173
935 delete $self->{motion}; 1174 !!delete $self->{motion}
936} 1175}
937 1176
938sub mouse_motion { 1177sub mouse_motion {
939 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
940 1179
941 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
942} 1183}
943 1184
944sub _draw { 1185sub _draw {
945 my ($self) = @_; 1186 my ($self) = @_;
946 1187
1188 my $child = $self->{children}[0];
1189
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
949 1192
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1195
955 my $border = $self->border; 1196 my $border = $self->border;
956 1197
957 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1203
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
965 1206
966 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
967 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
968 my $rep_y = $ch / $bg->{h}; 1210 $bg->{t} = $ch / $bg->{h};
969
970 glColor @{ $self->{bg} };
971
972 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1212 }
976 1213
977 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1215
981 $self->{title}->draw if $self->{title};
982
983 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
984} 1222}
985 1223
986############################################################################# 1224#############################################################################
987 1225
988package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
996sub new { 1234sub new {
997 my $class = shift; 1235 my $class = shift;
998 1236
999 $class->SUPER::new ( 1237 $class->SUPER::new (
1000 col_expand => [], 1238 col_expand => [],
1001 @_ 1239 @_,
1002 ) 1240 )
1241}
1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003} 1245}
1004 1246
1005sub add { 1247sub add {
1006 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1007 1249
1008 $child->set_parent ($self); 1250 $child->set_parent ($self);
1009 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1010 1252
1011 $child->check_size; 1253 $self->realloc;
1012} 1254}
1013 1255
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
1018# TODO: move to container class maybe? send childs a signal on removal? 1256# TODO: move to container class maybe? send children a signal on removal?
1019sub clear { 1257sub clear {
1020 my ($self) = @_; 1258 my ($self) = @_;
1021 1259
1022 my @children = $self->children; 1260 my @children = $self->children;
1023 delete $self->{children}; 1261 delete $self->{children};
… …
1025 for (@children) { 1263 for (@children) {
1026 delete $_->{parent}; 1264 delete $_->{parent};
1027 $_->hide; 1265 $_->hide;
1028 } 1266 }
1029 1267
1030 $self->update; 1268 $self->realloc;
1031} 1269}
1032 1270
1033sub get_wh { 1271sub get_wh {
1034 my ($self) = @_; 1272 my ($self) = @_;
1035 1273
… …
1066sub size_allocate { 1304sub size_allocate {
1067 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
1068 1306
1069 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
1070 1308
1071 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
1072 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
1073 1311
1074 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
1075 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
1076 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
1077 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1131 } 1369 }
1132} 1370}
1133 1371
1134############################################################################# 1372#############################################################################
1135 1373
1136package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1137
1138# TODO: wrap into common Box base class
1139 1375
1140our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1141 1377
1142sub size_request { 1378sub size_request {
1143 my ($self) = @_; 1379 my ($self) = @_;
1144 1380
1145 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1146 1382 ? (
1147 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1148 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1149 (List::Util::max map $_->[1], @alloc), 1385 )
1150 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1151} 1390}
1152 1391
1153sub size_allocate { 1392sub size_allocate {
1154 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1155 1394
1156 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1157
1158 my $children = $self->{children}; 1396 my $children = $self->{children};
1159 1397
1160 my @h = map $_->{req_w}, @$children; 1398 my @req;
1161 1399
1162 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1163 1401 @req = ($space / (@$children || 1)) x @$children;
1164 if ($req_h > $h) {
1165 # ah well, not enough space
1166 $_ *= $h / $req_h for @h;
1167 } else { 1402 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1404 my $req = List::Util::sum @req;
1405
1406 if ($req > $space) {
1407 # ah well, not enough space
1408 $_ *= $space / $req for @req;
1409 } else {
1168 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1169 $exp ||= 1;
1170 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1171 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1172 my $child = $children->[$_];
1173
1174 my $alloc_h = $h[$_];
1175 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1176 $h[$_] = $alloc_h;
1177 } 1416 }
1178 } 1417 }
1179 1418
1180 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1181 1420
1182 my $y = 0; 1421 my $pos = 0;
1183 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1184 my $child = $children->[$_];
1185 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1186 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1187 1425
1188 $y += $h; 1426 $pos += $alloc;
1189 } 1427 }
1190 1428
1191 1 1429 1
1192} 1430}
1193 1431
1194############################################################################# 1432#############################################################################
1195 1433
1434package CFClient::UI::HBox;
1435
1436our @ISA = CFClient::UI::Box::;
1437
1438sub new {
1439 my $class = shift;
1440
1441 $class->SUPER::new (
1442 vertical => 0,
1443 @_,
1444 )
1445}
1446
1447#############################################################################
1448
1196package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1197 1450
1198# TODO: wrap into common Box base class
1199
1200our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1201 1452
1202sub size_request { 1453sub new {
1203 my ($self) = @_; 1454 my $class = shift;
1204 1455
1205 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1206 1457 vertical => 1,
1207 ( 1458 @_,
1208 (List::Util::max map $_->[0], @alloc),
1209 (List::Util::sum map $_->[1], @alloc),
1210 ) 1459 )
1211} 1460}
1212 1461
1213sub size_allocate {
1214 my ($self, $w, $h) = @_;
1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_h}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1235 }
1236 }
1237
1238 CFClient::UI::harmonize \@h;
1239
1240 my $y = 0;
1241 for (0 .. $#$children) {
1242 my $child = $children->[$_];
1243 my $h = $h[$_];
1244 $child->configure (0, $y, $w, $h);
1245
1246 $y += $h;
1247 }
1248
1249 1
1250}
1251
1252############################################################################# 1462#############################################################################
1253 1463
1254package CFClient::UI::Label; 1464package CFClient::UI::Label;
1255 1465
1256our @ISA = CFClient::UI::Base::; 1466our @ISA = CFClient::UI::DrawBG::;
1257 1467
1258use CFClient::OpenGL; 1468use CFClient::OpenGL;
1259 1469
1260sub new { 1470sub new {
1261 my ($class, %arg) = @_; 1471 my ($class, %arg) = @_;
1262 1472
1263 my $self = $class->SUPER::new ( 1473 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1474 fg => [1, 1, 1],
1475 #bg => none
1476 #active_bg => none
1265 #font => default_font 1477 #font => default_font
1266 #text => initial text 1478 #text => initial text
1267 #markup => initial narkup 1479 #markup => initial narkup
1480 #max_w => maximum pixel width
1481 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1269 fontsize => 1, 1483 fontsize => 1,
1270 align => -1, 1484 align => -1,
1271 valign => -1, 1485 valign => -1,
1272 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1273 can_events => 0, 1488 can_events => 0,
1274 %arg 1489 %arg
1275 ); 1490 );
1276 1491
1277 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
… …
1287 } 1502 }
1288 1503
1289 $self 1504 $self
1290} 1505}
1291 1506
1292sub escape { 1507sub escape($) {
1293 local $_ = $_[1]; 1508 local $_ = $_[0];
1294 1509
1295 s/&/&amp;/g; 1510 s/&/&amp;/g;
1296 s/>/&gt;/g; 1511 s/>/&gt;/g;
1297 s/</&lt;/g; 1512 s/</&lt;/g;
1298 1513
1299 $_[1] 1514 $_
1300} 1515}
1301 1516
1302sub update { 1517sub update {
1303 my ($self) = @_; 1518 my ($self) = @_;
1304 1519
… …
1313 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1314 1529
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1316 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1317 1532
1533 $self->realloc;
1318 $self->update; 1534 $self->update;
1319 $self->check_size;
1320} 1535}
1321 1536
1322sub set_markup { 1537sub set_markup {
1323 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1324 1539
… …
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329 1544
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1331 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1332 1547
1548 $self->realloc;
1333 $self->update; 1549 $self->update;
1334 $self->check_size;
1335} 1550}
1336 1551
1337sub size_request { 1552sub size_request {
1338 my ($self) = @_; 1553 my ($self) = @_;
1339 1554
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1555 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1); 1556 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1560
1344 my ($w, $h) = $self->{layout}->size; 1561 my ($w, $h) = $self->{layout}->size;
1345 1562
1346 if (exists $self->{template}) { 1563 if (exists $self->{template}) {
… …
1351 1568
1352 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1353 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1354 } 1571 }
1355 1572
1356 ( 1573 ($w, $h)
1357 $w + $self->{padding} * 2,
1358 $h + $self->{padding} * 2,
1359 )
1360} 1574}
1361 1575
1362sub size_allocate { 1576sub size_allocate {
1363 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1364 1578
1579 delete $self->{ox};
1580
1365 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1366} 1583}
1367 1584
1368sub set_fontsize { 1585sub set_fontsize {
1369 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1370 1587
1371 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1372 delete $self->{texture}; 1589 delete $self->{texture};
1373 1590
1374 $self->update; 1591 $self->realloc;
1375 $self->check_size;
1376} 1592}
1377 1593
1378sub _draw { 1594sub _draw {
1379 my ($self) = @_; 1595 my ($self) = @_;
1596
1597 $self->SUPER::_draw; # draw background, if applicable
1380 1598
1381 my $tex = $self->{texture} ||= do { 1599 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1600 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1601 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1602 $self->{layout}->set_width ($self->{w});
1603 $self->{layout}->set_ellipsise ($self->{ellipsise});
1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1606
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1388 1609
1610 unless (exists $self->{ox}) {
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1613 : ($self->{w} - $tex->{w}) * 0.5);
1392 1614
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1617 : ($self->{h} - $tex->{h}) * 0.5);
1396
1397 $tex
1398 }; 1618 };
1399 1619
1400 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1402 1622
… …
1428 active_fg => [0, 0, 0], 1648 active_fg => [0, 0, 0],
1429 can_hover => 1, 1649 can_hover => 1,
1430 can_focus => 1, 1650 can_focus => 1,
1431 valign => 0, 1651 valign => 0,
1432 can_events => 1, 1652 can_events => 1,
1653 #text => ...
1433 @_ 1654 @_
1434 ) 1655 )
1435} 1656}
1436 1657
1437sub _set_text { 1658sub _set_text {
… …
1447 $self->{text} = $text; 1668 $self->{text} = $text;
1448 1669
1449 $text =~ s/./*/g if $self->{hidden}; 1670 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1671 $self->{layout}->set_text ("$text ");
1451 1672
1452 $self->emit (changed => $self->{text}); 1673 $self->_emit (changed => $self->{text});
1453} 1674}
1454 1675
1455sub set_text { 1676sub set_text {
1456 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1457 1678
1458 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1680 $self->_set_text ($text);
1460 $self->check_size; 1681
1461 $self->update; 1682 $self->realloc;
1462} 1683}
1463 1684
1464sub get_text { 1685sub get_text {
1465 $_[0]{text} 1686 $_[0]{text}
1466} 1687}
… …
1469 my ($self) = @_; 1690 my ($self) = @_;
1470 1691
1471 my ($w, $h) = $self->SUPER::size_request; 1692 my ($w, $h) = $self->SUPER::size_request;
1472 1693
1473 ($w + 1, $h) # add 1 for cursor 1694 ($w + 1, $h) # add 1 for cursor
1474}
1475
1476sub size_allocate {
1477 my ($self, $w, $h) = @_;
1478
1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480} 1695}
1481 1696
1482sub key_down { 1697sub key_down {
1483 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1484 1699
… …
1486 my $sym = $ev->{sym}; 1701 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1702 my $uni = $ev->{unicode};
1488 1703
1489 my $text = $self->get_text; 1704 my $text = $self->get_text;
1490 1705
1491 if ($sym == 8) { 1706 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1707 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1708 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1709 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1710 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1711 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1712 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1713 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1714 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1715 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1716 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1718 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1719 $self->_emit ('escape');
1505 } elsif ($uni) { 1720 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1507 } 1724 }
1508 1725
1509 $self->_set_text ($text); 1726 $self->_set_text ($text);
1510 $self->update; 1727
1728 $self->realloc;
1729
1730 1
1511} 1731}
1512 1732
1513sub focus_in { 1733sub focus_in {
1514 my ($self) = @_; 1734 my ($self) = @_;
1515 1735
… …
1530 utf8::encode $text; 1750 utf8::encode $text;
1531 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1532 1752
1533 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1534 $self->update; 1754 $self->update;
1755
1756 1
1535} 1757}
1536 1758
1537sub mouse_motion { 1759sub mouse_motion {
1538 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1539# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762
1763 0
1540} 1764}
1541 1765
1542sub _draw { 1766sub _draw {
1543 my ($self) = @_; 1767 my ($self) = @_;
1544 1768
… …
1595 if ($sym == 13) { 1819 if ($sym == 13) {
1596 unshift @{$self->{history}}, 1820 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 1821 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1; 1822 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 1823 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 1824 $self->_emit (activate => $txt);
1601 $self->update; 1825 $self->update;
1602 1826
1603 } elsif ($sym == CFClient::SDLK_UP) { 1827 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) { 1828 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text; 1829 $self->{history_saveback} = $self->get_text;
… …
1621 } else { 1845 } else {
1622 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1623 } 1847 }
1624 1848
1625 } else { 1849 } else {
1626 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1627 } 1853 1
1628
1629} 1854}
1630 1855
1631############################################################################# 1856#############################################################################
1632 1857
1633package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1642 1867
1643sub new { 1868sub new {
1644 my $class = shift; 1869 my $class = shift;
1645 1870
1646 $class->SUPER::new ( 1871 $class->SUPER::new (
1647 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1648 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1651 can_hover => 1, 1876 can_hover => 1,
1652 align => 0, 1877 align => 0,
1653 valign => 0, 1878 valign => 0,
1654 can_events => 1, 1879 can_events => 1,
1655 @_ 1880 @_
1656 ) 1881 )
1657} 1882}
1658 1883
1884sub activate { }
1885
1659sub button_up { 1886sub button_up {
1660 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1661 1888
1889 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 1891 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate"); 1892
1665 } 1893 1
1666} 1894}
1667 1895
1668sub _draw { 1896sub _draw {
1669 my ($self) = @_; 1897 my ($self) = @_;
1670 1898
… …
1672 1900
1673 if ($GRAB == $self) { 1901 if ($GRAB == $self) {
1674 $self->{fg} = $self->{active_fg}; 1902 $self->{fg} = $self->{active_fg};
1675 } 1903 }
1676 1904
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1905 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 glColor 0, 0, 0, 1; 1907 glColor 0, 0, 0, 1;
1682 1908
1683 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1909 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684 1910
1685 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1686 glDisable GL_BLEND;
1687 1912
1688 $self->SUPER::_draw; 1913 $self->SUPER::_draw;
1689} 1914}
1690 1915
1691############################################################################# 1916#############################################################################
… …
1702 1927
1703sub new { 1928sub new {
1704 my $class = shift; 1929 my $class = shift;
1705 1930
1706 $class->SUPER::new ( 1931 $class->SUPER::new (
1707 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1708 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1709 active_fg => [1, 1, 0], 1935 active_fg => [1, 1, 0],
1936 bg => [0, 0, 0, 0.2],
1937 active_bg => [1, 1, 1, 0.5],
1710 state => 0, 1938 state => 0,
1711 can_hover => 1, 1939 can_hover => 1,
1712 @_ 1940 @_
1713 ) 1941 )
1714} 1942}
1715 1943
1716sub size_request { 1944sub size_request {
1717 my ($self) = @_; 1945 my ($self) = @_;
1718 1946
1719 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1720} 1948}
1721 1949
1722sub button_down { 1950sub button_down {
1723 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1724 1952
1725 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1726 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1727 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1728 $self->emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1729 } 1961 1
1730} 1962}
1731 1963
1732sub _draw { 1964sub _draw {
1733 my ($self) = @_; 1965 my ($self) = @_;
1734 1966
1735 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1736 1968
1737 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1738 1970
1739 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1971 my ($w, $h) = @$self{qw(w h)};
1972
1973 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1740 1974
1741 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742 1976
1743 glEnable GL_BLEND; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1978
1744 glEnable GL_TEXTURE_2D; 1979 glEnable GL_TEXTURE_2D;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746
1747 my $tex = $self->{state} ? $tex[1] : $tex[0];
1748
1749 $tex->draw_quad (0, 0, $s, $s); 1980 $tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1752 glDisable GL_BLEND;
1753} 1982}
1754 1983
1755############################################################################# 1984#############################################################################
1756 1985
1757package CFClient::UI::Image; 1986package CFClient::UI::Image;
… …
1800 glTranslate 0, -$self->{w}, 0; 2029 glTranslate 0, -$self->{w}, 0;
1801 2030
1802 ($w, $h) = ($h, $w); 2031 ($w, $h) = ($h, $w);
1803 } 2032 }
1804 2033
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D; 2034 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2035 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809 2036
1810 $tex->draw_quad (0, 0, $w, $h); 2037 $tex->draw_quad_alpha (0, 0, $w, $h);
1811 2038
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1814} 2040}
1815 2041
1816############################################################################# 2042#############################################################################
1817 2043
… …
2006 qw(s1_slider.png s1_slider_bg.png); 2232 qw(s1_slider.png s1_slider_bg.png);
2007 2233
2008sub new { 2234sub new {
2009 my $class = shift; 2235 my $class = shift;
2010 2236
2011 # range [value, low, high, page] 2237 # range [value, low, high, page, unit]
2012 2238
2013 # TODO: 0-width page 2239 # TODO: 0-width page
2014 # TODO: req_w/h are wrong with vertical 2240 # TODO: req_w/h are wrong with vertical
2015 # TODO: calculations are off 2241 # TODO: calculations are off
2016 my $self = $class->SUPER::new ( 2242 my $self = $class->SUPER::new (
2017 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2018 active_fg => [0, 0, 0], 2244 active_fg => [0, 0, 0],
2245 bg => [0, 0, 0, 0.2],
2246 active_bg => [1, 1, 1, 0.5],
2019 range => [0, 0, 100, 10], 2247 range => [0, 0, 100, 10, 0],
2020 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2021 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2022 vertical => 0, 2250 vertical => 0,
2023 can_hover => 1, 2251 can_hover => 1,
2024 inner_pad => 5, 2252 inner_pad => 0.02,
2025 @_ 2253 @_
2026 ); 2254 );
2027 2255
2256 $self->set_value ($self->{range}[0]);
2257 $self->update;
2258
2028 $self 2259 $self
2029} 2260}
2030 2261
2262sub changed { }
2263
2264sub set_range {
2265 my ($self, $range) = @_;
2266
2267 ($range, $self->{range}) = ($self->{range}, $range);
2268
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}";
2271}
2272
2273sub set_value {
2274 my ($self, $value) = @_;
2275
2276 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2277
2278 $hi = $lo + 1 if $hi <= $lo;
2279
2280 $page = $hi - $lo if $page > $hi - $lo;
2281
2282 $value = $lo if $value < $lo;
2283 $value = $hi - $page if $value > $hi - $page;
2284
2285 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2286 if $unit;
2287
2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2289
2290 if ($value != $old_value) {
2291 $self->_emit (changed => $value);
2292 $self->update;
2293 }
2294}
2295
2031sub size_request { 2296sub size_request {
2032 my ($self) = @_; 2297 my ($self) = @_;
2033 2298
2034 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2035 my $h = $self->{req_h};
2036
2037 $self->{vertical} ? ($h, $w) : ($w, $h)
2038} 2300}
2039 2301
2040sub button_down { 2302sub button_down {
2041 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2042 2304
2043 $self->SUPER::button_down ($ev, $x, $y); 2305 $self->SUPER::button_down ($ev, $x, $y);
2306
2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2308
2044 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2045} 2310}
2046 2311
2047sub mouse_motion { 2312sub mouse_motion {
2048 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2049 2314
2050 if ($GRAB == $self) { 2315 if ($GRAB == $self) {
2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2317
2318 my (undef, $lo, $hi, $page) = @{$self->{range}};
2319
2320 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2321
2322 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2323 } else {
2324 return 0;
2325 }
2326
2327 1
2328}
2329
2330sub update {
2331 my ($self) = @_;
2332
2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2334 $self->set_value ($self->{range}[0]);
2335
2051 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2336 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100;
2052 2338
2053 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2339 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2054 2340
2055 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2341 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2056 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2342 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2057 2343
2058 $x -= $inner_pad_px; # substract the padding 2344 $value = ($value - $lo) / $range;
2059 $x = $x * ($hi - $lo) / $inner_w + $lo; 2345 $value = $value * $self->{scale} + $self->{offset};
2060 $x = $lo if $x < $lo;
2061 $x = $hi - $page if $x > $hi - $page;
2062 $self->{range}[0] = $x;
2063 2346
2064 $self->emit (changed => $x); 2347 $self->{knob_x} = $value - $knob_w * 0.5;
2065 $self->update; 2348 $self->{knob_w} = $knob_w;
2066 } 2349 });
2067}
2068 2350
2069# the inner_* stuff is for generating a padding for the slider handle, 2351 $self->SUPER::update;
2070# so that the handle doesn't leave the texture. This calculation isn't 100%
2071# correct propably, but it does the job for now
2072sub _calc_inner_pad_px {
2073 my ($self, $w) = @_;
2074 ($w / 100) * $self->{inner_pad} # % to pixels
2075} 2352}
2076 2353
2077sub _draw { 2354sub _draw {
2078 my ($self) = @_; 2355 my ($self) = @_;
2079 2356
2080 $self->SUPER::_draw (); 2357 $self->SUPER::_draw ();
2081 2358
2082 my ($w, $h) = @$self{qw(w h)}; 2359 glScale $self->{w}, $self->{h};
2083 2360
2084 if ($self->{vertical}) { 2361 if ($self->{vertical}) {
2085 # draw a vertical slider like a rotated horizontal slider 2362 # draw a vertical slider like a rotated horizontal slider
2086 2363
2364 glTranslate 1, 0, 0;
2087 glRotate 90, 0, 0, 1; 2365 glRotate 90, 0, 0, 1;
2088 glTranslate 0, -$self->{w}, 0;
2089
2090 ($w, $h) = ($h, $w);
2091 } 2366 }
2092 2367
2093 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2368 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2094 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2369 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2095 2370
2096 my ($value, $lo, $hi, $page) = @{$self->{range}};
2097
2098 $hi = $value + 1 if $lo == $hi;
2099
2100 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2101 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2102
2103 $page = int $page * $inner_w / ($hi - $lo);
2104 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2105
2106 $w -= $page;
2107 $page &= ~1;
2108 glTranslate $page * 0.5, 0, 0;
2109 $page ||= 2;
2110
2111 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2112 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2113
2114 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2371 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2372 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2373
2119 # draw background 2374 # draw background
2120 $tex[1]->draw_quad (0, 0, $w, $h); 2375 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2121 2376
2122 # draw handle 2377 # draw handle
2123 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2378 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2124 2379
2125 glDisable GL_BLEND;
2126 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2127} 2381}
2382
2383#############################################################################
2384
2385package CFClient::UI::ValSlider;
2386
2387our @ISA = CFClient::UI::HBox::;
2388
2389sub new {
2390 my ($class, %arg) = @_;
2391
2392 my $range = delete $arg{range};
2393
2394 my $self = $class->SUPER::new (
2395 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2396 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2397 to_value => sub { shift },
2398 from_value => sub { shift },
2399 %arg,
2400 );
2401
2402 $self->{slider}->connect (changed => sub {
2403 my ($self, $value) = @_;
2404 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2405 $self->{parent}->emit (changed => $value);
2406 });
2407
2408# $self->{entry}->connect (changed => sub {
2409# my ($self, $value) = @_;
2410# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2411# $self->{parent}->emit (changed => $value);
2412# });
2413
2414 $self->add ($self->{slider}, $self->{entry});
2415
2416 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2417
2418 $self
2419}
2420
2421sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) }
2128 2423
2129############################################################################# 2424#############################################################################
2130 2425
2131package CFClient::UI::TextView; 2426package CFClient::UI::TextView;
2132 2427
… …
2141 fontsize => 1, 2436 fontsize => 1,
2142 can_events => 0, 2437 can_events => 0,
2143 #font => default_font 2438 #font => default_font
2144 @_, 2439 @_,
2145 2440
2146 layout => (new CFClient::Layout), 2441 layout => (new CFClient::Layout 1),
2147 par => [], 2442 par => [],
2148 height => 0, 2443 height => 0,
2149 children => [ 2444 children => [
2150 (new CFClient::UI::Empty expand => 1), 2445 (new CFClient::UI::Empty expand => 1),
2151 (new CFClient::UI::Slider vertical => 1), 2446 (new CFClient::UI::Slider vertical => 1),
… …
2162 2457
2163 $self->{fontsize} = $fontsize; 2458 $self->{fontsize} = $fontsize;
2164 $self->reflow; 2459 $self->reflow;
2165} 2460}
2166 2461
2167sub text_height {
2168 my ($self, $text) = @_;
2169
2170 my $layout = $self->{layout};
2171
2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $layout->set_width ($self->{children}[0]{w});
2174 $layout->set_text ($text);
2175
2176 ($layout->size)[1]
2177}
2178
2179sub reflow {
2180 my ($self) = @_;
2181
2182 $self->{need_reflow}++;
2183 $self->update;
2184}
2185
2186sub size_allocate { 2462sub size_allocate {
2187 my ($self, $w, $h) = @_; 2463 my ($self, $w, $h) = @_;
2188 2464
2189 $self->SUPER::size_allocate ($w, $h); 2465 $self->SUPER::size_allocate ($w, $h);
2190 2466
… …
2193 $self->{layout}->set_width ($self->{children}[0]{w}); 2469 $self->{layout}->set_width ($self->{children}[0]{w});
2194 2470
2195 $self->reflow; 2471 $self->reflow;
2196} 2472}
2197 2473
2474sub text_size {
2475 my ($self, $text, $indent) = @_;
2476
2477 my $layout = $self->{layout};
2478
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent);
2481 $layout->set_markup ($text);
2482
2483 $layout->size
2484}
2485
2486sub reflow {
2487 my ($self) = @_;
2488
2489 $self->{need_reflow}++;
2490 $self->update;
2491}
2492
2493sub set_offset {
2494 my ($self, $offset) = @_;
2495
2496 # todo: base offset on lines or so, not on pixels
2497 $self->{children}[1]->set_value ($offset);
2498}
2499
2500sub clear {
2501 my ($self) = @_;
2502
2503 $self->{par} = [];
2504 $self->{height} = 0;
2505 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2506}
2507
2198sub add_paragraph { 2508sub add_paragraph {
2199 my ($self, $color, $text) = @_; 2509 my ($self, $color, $text, $indent) = @_;
2200 2510
2201 #TODO: intelligently "reformat" paragraph 2511 for my $line (split /\n/, $text) {
2202 2512 my ($w, $h) = $self->text_size ($line);
2203 my $height = $self->text_height ($text);
2204
2205 $self->{height} += $height; 2513 $self->{height} += $h;
2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2515 }
2206 2516
2207 push @{$self->{par}}, [$height, $color, $text];
2208
2209 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2517 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2210 $self->{children}[1]->update;
2211} 2518}
2212 2519
2213sub update { 2520sub update {
2214 my ($self) = @_; 2521 my ($self) = @_;
2215 2522
… …
2217 2524
2218 return unless $self->{h} > 0; 2525 return unless $self->{h} > 0;
2219 2526
2220 delete $self->{texture}; 2527 delete $self->{texture};
2221 2528
2222 $ROOT->on_refresh ($self, sub { 2529 $ROOT->on_post_alloc ($self, sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531
2223 if (delete $self->{need_reflow}) { 2532 if (delete $self->{need_reflow}) {
2224 my $height = 0; 2533 my $height = 0;
2225 2534
2226 $height += $_->[0] = $self->text_height ($_->[2]) 2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2227 for @{$self->{par}}; 2539 for (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2541 $layout->set_width ($W - $_->[3]);
2542 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3];
2545 $_->[1] = $h;
2546 }
2547
2548 $height += $_->[1];
2549 }
2228 2550
2229 $self->{height} = $height; 2551 $self->{height} = $height;
2230 2552
2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2232 2554
2233 delete $self->{texture}; 2555 delete $self->{texture};
2234 } 2556 }
2235 2557
2236 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2237 glClearColor 0, 0, 0, 0; 2559 glClearColor 0.5, 0.5, 0.5, 0;
2238 glClear GL_COLOR_BUFFER_BIT; 2560 glClear GL_COLOR_BUFFER_BIT;
2239 2561
2562 my $top = int $self->{children}[1]{range}[0];
2563
2564 my $y0 = $top;
2565 my $y1 = $top + $H;
2566
2567 my $y = 0;
2568
2569 my $layout = $self->{layout};
2570
2571 $layout->set_font ($self->{font}) if $self->{font};
2572
2240 glEnable GL_BLEND; 2573 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off
2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0];
2246
2247 my $y0 = $top;
2248 my $y1 = $top + $self->{h};
2249
2250 my $y = 0;
2251
2252 my $layout = $self->{layout};
2253
2254 $layout->set_font ($self->{font}) if $self->{font};
2255 2576
2256 for my $par (@{$self->{par}}) { 2577 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2578 my $h = $par->[1];
2258 2579
2259 if ($y0 < $y + $h && $y < $y1) { 2580 if ($y0 < $y + $h && $y < $y1) {
2581 $layout->set_foreground (@{ $par->[2] });
2582 $layout->set_width ($W - $par->[3]);
2260 $layout->set_text ($par->[2]); 2583 $layout->set_markup ($par->[4]);
2261 2584
2262 glColor @{ $par->[1] }; 2585 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2263 my ($W, $H) = $layout->size; 2586
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2587 glRasterPos $par->[3], $y - $y0;
2588 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2589 }
2266 2590
2267 $y += $h; 2591 $y += $h;
2268 } 2592 }
2269 2593
2270 glDisable GL_TEXTURE_2D;
2271 glDisable GL_BLEND; 2594 glDisable GL_BLEND;
2272 }; 2595 };
2273 }); 2596 });
2274} 2597}
2275 2598
2276sub _draw { 2599sub _draw {
2277 my ($self) = @_; 2600 my ($self) = @_;
2278 2601
2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281 glEnable GL_TEXTURE_2D; 2602 glEnable GL_TEXTURE_2D;
2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283 glColor 1, 1, 1, 1; 2604 glColor 1, 1, 1, 1;
2284 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2605 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2285 glDisable GL_TEXTURE_2D; 2606 glDisable GL_TEXTURE_2D;
2286 glDisable GL_BLEND;
2287 2607
2288 $self->{children}[1]->draw; 2608 $self->{children}[1]->draw;
2289 2609
2290} 2610}
2291 2611
… …
2339 2659
2340sub new { 2660sub new {
2341 my $class = shift; 2661 my $class = shift;
2342 2662
2343 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2344 state => 0, 2664 state => 0,
2345 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2346 @_ 2666 @_
2347 ); 2667 );
2348 2668
2349 if ($self->{state}) {
2350 $self->{state} = 0;
2351 $self->toggle_flopper;
2352 }
2353
2354 $self 2669 $self
2355} 2670}
2356 2671
2357sub toggle_flopper { 2672sub toggle_flopper {
2358 my ($self) = @_; 2673 my ($self) = @_;
2359 2674
2360 # TODO: use animation 2675 $self->{other}->toggle_visibility;
2361 if ($self->{state} = !$self->{state}) {
2362 $CFClient::UI::ROOT->add ($self->{other});
2363 $self->{other}->move ($self->coord2global (0, $self->{h}));
2364 $self->emit ("open");
2365 } else {
2366 $CFClient::UI::ROOT->remove ($self->{other});
2367 $self->emit ("close");
2368 }
2369
2370 $self->emit (changed => $self->{state});
2371} 2676}
2372 2677
2373############################################################################# 2678#############################################################################
2374 2679
2375package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2385 @_, 2690 @_,
2386 can_events => 0, 2691 can_events => 0,
2387 ) 2692 )
2388} 2693}
2389 2694
2390sub set_markup { 2695sub set_tooltip_from {
2391 my ($self, $text) = @_; 2696 my ($self, $widget) = @_;
2392 2697
2393 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2698 my $tooltip = $widget->{tooltip};
2394 $self->{label}->set_markup ($text); 2699
2395 $self->add ($self->{label}); 2700 if ($ENV{CFPLUS_DEBUG} & 2) {
2701 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}";
2705 }
2706
2707 $self->add (new CFClient::UI::Label
2708 markup => $tooltip,
2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2710 fontsize => 0.8,
2711 fg => [0, 0, 0, 1],
2712 ellipsise => 0,
2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
2714 );
2396} 2715}
2397 2716
2398sub size_request { 2717sub size_request {
2399 my ($self) = @_; 2718 my ($self) = @_;
2400
2401 $self->child->set_max_size ($::WIDTH * 0.3);
2402 2719
2403 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2720 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404 2721
2405 ($w + 4, $h + 4) 2722 ($w + 4, $h + 4)
2406} 2723}
… …
2409 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2410 2727
2411 $self->SUPER::size_allocate ($w - 4, $h - 4); 2728 $self->SUPER::size_allocate ($w - 4, $h - 4);
2412} 2729}
2413 2730
2731sub visibility_change {
2732 my ($self, $visible) = @_;
2733
2734 return unless $visible;
2735
2736 $self->{root}->on_post_alloc ("move_$self" => sub {
2737 my $widget = $self->{owner}
2738 or return;
2739
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH;
2744
2745 $self->move_abs ($x, $y);
2746 });
2747}
2748
2414sub _draw { 2749sub _draw {
2415 my ($self) = @_; 2750 my ($self) = @_;
2416 2751
2417 glPushMatrix;
2418 glTranslate 0.375, 0.375; 2752 glTranslate 0.375, 0.375;
2419 2753
2420 my ($w, $h) = @$self{qw(w h)}; 2754 my ($w, $h) = @$self{qw(w h)};
2421 2755
2422 glColor 1, 0.8, 0.4; 2756 glColor 1, 0.8, 0.4;
… …
2433 glVertex 0 , $h; 2767 glVertex 0 , $h;
2434 glVertex $w, $h; 2768 glVertex $w, $h;
2435 glVertex $w, 0; 2769 glVertex $w, 0;
2436 glEnd; 2770 glEnd;
2437 2771
2438 glPopMatrix; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2439 2773
2440 glTranslate 2, 2;
2441 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2442} 2775}
2443 2776
2444############################################################################# 2777#############################################################################
2445 2778
… …
2450use CFClient::OpenGL; 2783use CFClient::OpenGL;
2451 2784
2452sub new { 2785sub new {
2453 my $class = shift; 2786 my $class = shift;
2454 2787
2455 $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2456 aspect => 1, 2789 aspect => 1,
2790 can_events => 0,
2457 @_, 2791 @_,
2458 ) 2792 );
2793
2794 if ($self->{anim} && $self->{animspeed}) {
2795 Scalar::Util::weaken (my $widget = $self);
2796
2797 $self->{timer} = Event->timer (
2798 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2799 hard => 1,
2800 interval => $self->{animspeed},
2801 cb => sub {
2802 ++$widget->{frame};
2803 $widget->update;
2804 },
2805 );
2806 }
2807
2808 $self
2459} 2809}
2460 2810
2461sub size_request { 2811sub size_request {
2462 (32, 8) 2812 (32, 8)
2463} 2813}
2464 2814
2815sub update {
2816 my ($self) = @_;
2817
2818 return unless $self->{visible};
2819
2820 $self->SUPER::update;
2821}
2822
2465sub _draw { 2823sub _draw {
2466 my ($self) = @_; 2824 my ($self) = @_;
2467 2825
2468 return unless $::CONN;#d# manage and cache textures differently 2826 return unless $::CONN;
2827
2828 my $face;
2829
2830 if ($self->{frame}) {
2831 my $anim = $::CONN->{anim}[$self->{anim}];
2832
2833 $face = $anim->[ $self->{frame} % @$anim ]
2834 if $anim && @$anim;
2835 }
2836
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2838
2471 # TODO animation
2472 if ($tex) { 2839 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2840 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2842 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2845 }
2482} 2846}
2483 2847
2484############################################################################# 2848sub DESTROY {
2485
2486package CFClient::UI::InventoryItem;
2487
2488our @ISA = CFClient::UI::HBox::;
2489
2490sub new {
2491 my $class = shift;
2492
2493 my %args = @_;
2494
2495 my $item = delete $args{item};
2496
2497 my $desc = $item->{nrof} < 2
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501
2502 my $self = $class->SUPER::new (
2503 can_hover => 1,
2504 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_;
2509
2510 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) {
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ],
2527 )->popup ($ev);
2528 }
2529
2530 1
2531 },
2532 %args
2533 );
2534
2535 $self->add (new CFClient::UI::Face
2536 can_events => 0,
2537 face => $item->{face},
2538 anim => $item->{anim},
2539 animspeed => $item->{animspeed},
2540 );
2541
2542 $self->add (new CFClient::UI::Label
2543 can_events => 0,
2544 text => $desc,
2545 );
2546
2547 $self
2548}
2549
2550#############################################################################
2551
2552package CFClient::UI::Inventory;
2553
2554our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556sub new {
2557 my $class = shift;
2558
2559 my $self = $class->SUPER::new (
2560 scrolled => (new CFClient::UI::VBox),
2561 @_,
2562 );
2563
2564 $self
2565}
2566
2567sub set_items {
2568 my ($self, $items) = @_; 2849 my ($self) = @_;
2569 2850
2570 $self->{scrolled}->clear; 2851 $self->{timer}->cancel
2571 return unless $items; 2852 if $self->{timer};
2572 2853
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2854 $self->SUPER::DESTROY;
2574
2575 $self->{real_items} = \@items;
2576
2577 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2583 }
2584
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586}
2587
2588sub size_request {
2589 my ($self) = @_;
2590 ($self->{req_w}, $self->{req_h});
2591} 2855}
2592 2856
2593############################################################################# 2857#############################################################################
2594 2858
2595package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
… …
2630 2894
2631# popup given the event (must be a mouse button down event currently) 2895# popup given the event (must be a mouse button down event currently)
2632sub popup { 2896sub popup {
2633 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2634 2898
2635 $self->emit ("popdown"); 2899 $self->_emit ("popdown");
2636 2900
2637 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2638 $GRAB = $self; 2902 $GRAB = $self;
2639 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2640 2904
2641 $self->show; 2905 $self->show;
2642 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2643} 2907}
2644 2908
2645sub mouse_motion { 2909sub mouse_motion {
2646 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2647 2911
2648 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2649 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2650 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2651} 2917}
2652 2918
2653sub button_up { 2919sub button_up {
2654 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2655 2921
2656 if ($ev->{button} == $self->{button}) { 2922 if ($ev->{button} == $self->{button}) {
2657 undef $GRAB; 2923 undef $GRAB;
2658 $self->hide; 2924 $self->hide;
2659 2925
2660 $self->emit ("popdown"); 2926 $self->_emit ("popdown");
2661 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2662 } 2932 1
2663} 2933}
2664 2934
2665############################################################################# 2935#############################################################################
2666 2936
2667package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
2668 2938
2669our @ISA = CFClient::UI::VBox::; 2939our @ISA = CFClient::UI::VBox::;
2940
2941sub new {
2942 my $class = shift;
2943
2944 $class->SUPER::new (
2945 fontsize => 0.8,
2946 @_,
2947 )
2948}
2670 2949
2671sub reorder { 2950sub reorder {
2672 my ($self) = @_; 2951 my ($self) = @_;
2673 my $NOW = time; 2952 my $NOW = time;
2674 2953
2675 while (my ($k, $v) = each %{ $self->{item} }) { 2954 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2955 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 } 2956 }
2678 2957
2679 my @widgets; 2958 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2959
2960 my @items = sort {
2961 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} };
2964
2681 my $count = 10 + 1; 2965 my $count = 10 + 1;
2682 for my $item (@items) { 2966 for my $item (@items) {
2683 last unless --$count; 2967 last unless --$count;
2684 2968
2685 push @widgets, $item->{label} ||= do { 2969 push @widgets, $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all) 2970 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text}; 2971 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text};
2974
2688 for ($short) { 2975 for ($short) {
2689 s/^\s+//; 2976 s/^\s+//;
2690 s/\012.*//s; 2977 s/\s+/ /g;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 } 2978 }
2694 2979
2695 new CFClient::UI::Label 2980 new CFClient::UI::Label
2696 markup => $short, 2981 markup => $short,
2697 tooltip => delete $item->{tooltip}, 2982 tooltip => $item->{tooltip},
2698 fontsize => delete $item->{fontsize}, 2983 tooltip_font => $::FONT_PROP,
2699 color => delete $item->{color}, 2984 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg},
2700 can_events => 1, 2988 can_events => 1,
2701 can_hover => 1, 2989 can_hover => 1
2702 }; 2990 };
2703 } 2991 }
2704 2992
2705 $self->clear; 2993 $self->clear;
2706 $self->SUPER::add (@widgets); 2994 $self->SUPER::add (reverse @widgets);
2707} 2995}
2708 2996
2709sub add { 2997sub add {
2710 my ($self, $text, %arg) = @_; 2998 my ($self, $text, %arg) = @_;
2711 2999
2712 my $item = { 3000 $text =~ s/^\s+//;
2713 time => time, 3001 $text =~ s/\s+$//;
3002
3003 return unless $text;
3004
3005 my $timeout = time + ((delete $arg{timeout}) || 60);
3006
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008
3009 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) {
3011 $item->{count}++;
3012 } else {
3013 $item->{count} = 1;
3014 $item->{text} = $item->{tooltip} = $text;
3015 }
3016 $item->{id} = ++$self->{id};
3017 $item->{timeout} = $timeout;
3018 delete $item->{label};
3019 } else {
3020 $self->{item}{$group} = {
3021 id => ++$self->{id},
2714 text => $text, 3022 text => $text,
2715 timeout => 60, 3023 timeout => $timeout,
2716 tooltip => $text, 3024 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8], 3025 fg => [0.8, 0.8, 0.8, 0.8],
3026 pri => 0,
3027 count => 1,
2719 %arg, 3028 %arg,
3029 };
2720 }; 3030 }
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726 3031
2727 $self->reorder; 3032 $self->reorder;
2728} 3033}
2729 3034
3035sub reconfigure {
3036 my ($self) = @_;
3037
3038 delete $_->{label}
3039 for values %{ $self->{item} || {} };
3040
3041 $self->reorder;
3042 $self->SUPER::reconfigure;
3043}
3044
2730############################################################################# 3045#############################################################################
2731 3046
2732package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
2733 3048
2734our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
2735
2736use CFClient::OpenGL;
2737 3050
2738sub new { 3051sub new {
2739 my $class = shift; 3052 my $class = shift;
2740 3053
2741 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2742 @_, 3056 @_,
2743 ) 3057 );
2744}
2745 3058
2746sub configure { 3059 $self
3060}
3061
3062sub set_items {
3063 my ($self, $items) = @_;
3064
3065 $self->{scrolled}->clear;
3066 return unless $items;
3067
3068 my @items = sort {
3069 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name})
3071 } @$items;
3072
3073 $self->{real_items} = \@items;
3074
3075 my $row = 0;
3076 for my $item (@items) {
3077 CFClient::Item::update_widgets $item;
3078
3079 $self->{scrolled}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3082
3083 $row++;
3084 }
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::BindEditor;
3090
3091our @ISA = CFClient::UI::FancyFrame::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3097
3098 $self->add (my $vb = new CFClient::UI::VBox);
3099
3100
3101 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3102 text => "start recording",
3103 tooltip => "Start/Stops recording of actions."
3104 ."All subsequent actions after the recording started will be captured."
3105 ."The actions are displayed after the record was stopped."
3106 ."To bind the action you have to click on the 'Bind' button",
3107 on_activate => sub {
3108 unless ($self->{recording}) {
3109 $self->start;
3110 } else {
3111 $self->stop;
3112 }
3113 });
3114
3115 $vb->add (new CFClient::UI::Label text => "Actions:");
3116 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3117
3118 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3119 $vb->add (my $hb = new CFClient::UI::HBox);
3120 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3121 $hb->add (new CFClient::UI::Button
3122 text => "bind",
3123 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3124 on_activate => sub {
3125 $self->ask_for_bind;
3126 });
3127
3128 $vb->add (my $hb = new CFClient::UI::HBox);
3129 $hb->add (new CFClient::UI::Button
3130 text => "ok",
3131 expand => 1,
3132 tooltip => "This closes the binding editor and saves the binding",
3133 on_activate => sub {
3134 $self->hide;
3135 $self->commit;
3136 });
3137
3138 $hb->add (new CFClient::UI::Button
3139 text => "cancel",
3140 expand => 1,
3141 tooltip => "This closes the binding editor without saving",
3142 on_activate => sub {
3143 $self->hide;
3144 $self->{binding_cancel}->()
3145 if $self->{binding_cancel};
3146 });
3147
3148 $self->update_binding_widgets;
3149
3150 $self
3151}
3152
3153sub commit {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3158 ."'. Don't forget 'Save Config'!");
3159 $self->{binding_change}->($mod, $sym, $cmds)
3160 if $self->{binding_change};
3161 } else {
3162 $::STATUSBOX->add ("No action bound, no key or action specified!");
3163 $self->{binding_cancel}->()
3164 if $self->{binding_cancel};
3165 }
3166}
3167
3168sub start {
3169 my ($self) = @_;
3170
3171 $self->{rec_btn}->set_text ("stop recording");
3172 $self->{recording} = 1;
3173 $self->clear_command_list;
3174 $::CONN->start_record if $::CONN;
3175}
3176
3177sub stop {
3178 my ($self) = @_;
3179
3180 $self->{rec_btn}->set_text ("start recording");
3181 $self->{recording} = 0;
3182
3183 my $rec;
3184 $rec = $::CONN->stop_record if $::CONN;
3185 return unless ref $rec eq 'ARRAY';
3186 $self->set_command_list ($rec);
3187}
3188
3189
3190sub ask_for_bind_and_commit {
3191 my ($self) = @_;
3192 $self->ask_for_bind (1);
3193}
3194
3195sub ask_for_bind {
3196 my ($self, $commit) = @_;
3197
3198 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets;
3202 $self->commit if $commit;
3203 });
3204}
3205
3206# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands)
3208# $cb is the callback that is executed on OK
3209# $ccb is the callback that is executed on CANCEL and
3210# when the binding was unsuccessful on OK
3211sub set_binding {
2747 my ($self, $x, $y, $w, $h) = @_; 3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2748 3213
2749 $self->{w} = $w; 3214 $self->clear_command_list;
2750 $self->{h} = $h; 3215 $self->{recording} = 0;
2751} 3216 $self->{rec_btn}->set_text ("start recording");
2752 3217
2753sub check_size { 3218 $self->{binding} = [$mod, $sym];
3219 $self->{commands} = $cmds;
3220
3221 $self->{binding_change} = $cb;
3222 $self->{binding_cancel} = $ccb;
3223
3224 $self->update_binding_widgets;
3225}
3226
3227# this is a shortcut method that asks for a binding
3228# and then just binds it.
3229sub do_quick_binding {
2754 my ($self) = @_; 3230 my ($self, $cmds) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1);
3235}
2755 3236
2756 $self->size_allocate ($self->{w}, $self->{h}) 3237sub update_binding_widgets {
2757 if $self->{w}; 3238 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding;
3240 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3241 $self->set_command_list ($cmds);
3242}
3243
3244sub get_binding {
3245 my ($self) = @_;
3246 return (
3247 $self->{binding}->[0],
3248 $self->{binding}->[1],
3249 [ grep { defined $_ } @{$self->{commands}} ]
3250 );
3251}
3252
3253sub clear_command_list {
3254 my ($self) = @_;
3255 $self->{cmdbox}->clear ();
3256}
3257
3258sub set_command_list {
3259 my ($self, $cmds) = @_;
3260
3261 $self->{cmdbox}->clear ();
3262 $self->{commands} = $cmds;
3263
3264 my $idx = 0;
3265
3266 for (@$cmds) {
3267 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3268
3269 my $i = $idx;
3270 $hb->add (new CFClient::UI::Label text => $_);
3271 $hb->add (new CFClient::UI::Button
3272 text => "delete",
3273 tooltip => "Deletes the action from the record",
3274 on_activate => sub {
3275 $self->{cmdbox}->remove ($hb);
3276 $cmds->[$i] = undef;
3277 });
3278
3279
3280 $idx++
3281 }
3282}
3283
3284#############################################################################
3285
3286package CFClient::UI::SpellList;
3287
3288our @ISA = CFClient::UI::FancyFrame::;
3289
3290sub new {
3291 my $class = shift;
3292
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3294
3295 $self->add (new CFClient::UI::ScrolledWindow
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3297
3298 $self;
3299}
3300
3301# XXX: Do sorting? Argl...
3302sub add_spell {
3303 my ($self, $spell) = @_;
3304 $self->{spells}->{$spell->{name}} = $spell;
3305
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333}
3334
3335sub remove_spell {
3336 my ($self, $spell) = @_;
3337 delete $self->{spells}->{$spell->{name}};
3338 $self->rebuild_spell_list;
3339}
3340
3341#############################################################################
3342
3343package CFClient::UI::Root;
3344
3345our @ISA = CFClient::UI::Container::;
3346
3347use CFClient::OpenGL;
3348
3349sub new {
3350 my $class = shift;
3351
3352 my $self = $class->SUPER::new (
3353 visible => 1,
3354 @_,
3355 );
3356
3357 Scalar::Util::weaken ($self->{root} = $self);
3358
3359 $self
2758} 3360}
2759 3361
2760sub size_request { 3362sub size_request {
2761 my ($self) = @_; 3363 my ($self) = @_;
2762 3364
2763 ($self->{w}, $self->{h}) 3365 ($self->{w}, $self->{h})
3366}
3367
3368sub _to_pixel {
3369 my ($coord, $size, $max) = @_;
3370
3371 $coord =
3372 $coord eq "center" ? ($max - $size) * 0.5
3373 : $coord eq "max" ? $max
3374 : $coord;
3375
3376 $coord = 0 if $coord < 0;
3377 $coord = $max - $size if $coord > $max - $size;
3378
3379 int $coord + 0.5
2764} 3380}
2765 3381
2766sub size_allocate { 3382sub size_allocate {
2767 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
2768 3384
2769 my $old_w = $self->{old_w};
2770 my $old_h = $self->{old_h};
2771
2772 if ($old_w && $old_h) {
2773 for my $child ($self->children) {
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784
2785 for my $child ($self->children) { 3385 for my $child ($self->children) {
2786 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2787 3387
2788 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3388 $X = $child->{force_x} if exists $child->{force_x};
2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3389 $Y = $child->{force_y} if exists $child->{force_y};
3390
3391 $X = _to_pixel $X, $W, $self->{w};
3392 $Y = _to_pixel $Y, $H, $self->{h};
3393
2790 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
2791 } 3395 }
2792
2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795} 3396}
2796 3397
2797sub coord2local { 3398sub coord2local {
2798 my ($self, $x, $y) = @_; 3399 my ($self, $x, $y) = @_;
2799 3400
… …
2807} 3408}
2808 3409
2809sub update { 3410sub update {
2810 my ($self) = @_; 3411 my ($self) = @_;
2811 3412
2812 $self->check_size;
2813 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
2814} 3414}
2815 3415
2816sub add { 3416sub add {
2817 my ($self, $child) = @_; 3417 my ($self, @children) = @_;
2818 3418
2819 # integerise window positions 3419 $_->{is_toplevel} = 1
2820 $child->{x} = int $child->{x}; 3420 for @children;
2821 $child->{y} = int $child->{y};
2822 3421
2823 $self->SUPER::add ($child); 3422 $self->SUPER::add (@children);
3423}
3424
3425sub remove {
3426 my ($self, @children) = @_;
3427
3428 $self->SUPER::remove (@children);
3429
3430 delete $self->{is_toplevel}
3431 for @children;
3432
3433 while (@children) {
3434 my $w = pop @children;
3435 push @children, $w->children;
3436 $w->set_invisible;
3437 }
2824} 3438}
2825 3439
2826sub on_refresh { 3440sub on_refresh {
2827 my ($self, $id, $cb) = @_; 3441 my ($self, $id, $cb) = @_;
2828 3442
2829 $self->{refresh_hook}{$id} = $cb; 3443 $self->{refresh_hook}{$id} = $cb;
2830} 3444}
2831 3445
3446sub on_post_alloc {
3447 my ($self, $id, $cb) = @_;
3448
3449 $self->{post_alloc_hook}{$id} = $cb;
3450}
3451
2832sub draw { 3452sub draw {
2833 my ($self) = @_; 3453 my ($self) = @_;
2834
2835 if ($self->{check_size}) {
2836 my @queue = ([], []);
2837
2838 for (;;) {
2839 if ($self->{check_size}) {
2840 # heuristic: check containers last
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2842 for values %{delete $self->{check_size}}
2843 }
2844
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2846
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request;
2850
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853
2854 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h;
2856
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2858
2859 $widget->{parent}->check_size
2860 if $widget->{parent};
2861 }
2862 }
2863 }
2864
2865 while ($self->{size_alloc}) {
2866 for (values %{delete $self->{size_alloc}}) {
2867 my ($widget, $w, $h) = @$_;
2868
2869 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0;
2871
2872 $widget->{w} = $w;
2873 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h);
2876 }
2877 }
2878 3454
2879 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
2880 $_->() 3456 $_->()
2881 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
2882 } 3458 }
2883 3459
3460 if ($self->{realloc}) {
3461 my %queue;
3462 my @queue;
3463 my $widget;
3464
3465 outer:
3466 while () {
3467 if (my $realloc = delete $self->{realloc}) {
3468 for $widget (values %$realloc) {
3469 $widget->{visible} or next; # do not resize invisible widgets
3470
3471 $queue{$widget+0}++ and next; # duplicates are common
3472
3473 push @{ $queue[$widget->{visible}] }, $widget;
3474 }
3475 }
3476
3477 while () {
3478 @queue or last outer;
3479
3480 $widget = pop @{ $queue[-1] || [] }
3481 and last;
3482
3483 pop @queue;
3484 }
3485
3486 delete $queue{$widget+0};
3487
3488 my ($w, $h) = $widget->size_request;
3489
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3492
3493 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h};
3495
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3497 || delete $widget->{force_realloc}) {
3498 $widget->{req_w} = $w;
3499 $widget->{req_h} = $h;
3500
3501 $self->{size_alloc}{$widget+0} = $widget;
3502
3503 if (my $parent = $widget->{parent}) {
3504 $self->{realloc}{$parent+0} = $parent
3505 unless $queue{$parent+0};
3506
3507 $parent->{force_size_alloc} = 1;
3508 $self->{size_alloc}{$parent+0} = $parent;
3509 }
3510 }
3511
3512 delete $self->{realloc}{$widget+0};
3513 }
3514 }
3515
3516 while (my $size_alloc = delete $self->{size_alloc}) {
3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
3518 values %$size_alloc;
3519
3520 while () {
3521 my $widget = pop @queue || last;
3522
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3524
3525 $w = 0 if $w < 0;
3526 $h = 0 if $h < 0;
3527
3528 $w = int $w + 0.5;
3529 $h = int $h + 0.5;
3530
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3532 $widget->{old_w} = $widget->{w};
3533 $widget->{old_h} = $widget->{h};
3534
3535 $widget->{w} = $w;
3536 $widget->{h} = $h;
3537
3538 $widget->emit (size_allocate => $w, $h);
3539 }
3540 }
3541 }
3542
3543 while ($self->{post_alloc_hook}) {
3544 $_->()
3545 for values %{delete $self->{post_alloc_hook}};
3546 }
3547
3548
2884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
2887 3552
2888 glMatrixMode GL_PROJECTION; 3553 glMatrixMode GL_PROJECTION;
2889 glLoadIdentity; 3554 glLoadIdentity;
2890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2891 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
2892 glLoadIdentity; 3557 glLoadIdentity;
2893 3558
3559 {
3560 package CFClient::UI::Base;
3561
3562 ($draw_x, $draw_y, $draw_w, $draw_h) =
3563 (0, 0, $self->{w}, $self->{h});
3564 }
3565
2894 $self->_draw; 3566 $self->_draw;
2895} 3567}
2896 3568
2897############################################################################# 3569#############################################################################
2898 3570
2899package CFClient::UI; 3571package CFClient::UI;
2900 3572
2901$ROOT = new CFClient::UI::Root; 3573$ROOT = new CFClient::UI::Root;
2902$TOOLTIP = new CFClient::UI::Tooltip; 3574$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2903 3575
29041 35761
2905 3577

Diff Legend

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