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.184 by root, Wed May 3 19:56:05 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 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
16sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
17 if (!$GRAB) { 47 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 61 }
40 62
41 return; 63 return;
42 } 64 }
43 } 65 }
… …
47 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
48} 70}
49 71
50# class methods for events 72# class methods for events
51sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 75 if $FOCUS;
54} 76}
55 77
56sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 80 if $FOCUS;
59} 81}
60 82
61sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
62 my ($ev) = @_; 84 my ($ev) = @_;
… …
71 check_tooltip; 93 check_tooltip;
72 } 94 }
73 95
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 97
76 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 100}
81 101
82sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
83 my ($ev) = @_; 103 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
85 105
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 107
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 109
90 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 112
95 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 115 $grab->update if $grab;
98 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 133
116 check_tooltip; 134 check_tooltip;
117 } 135 }
118 136
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 138 if $HOVER;
123} 139}
124 140
125# convert position array to integers 141# convert position array to integers
126sub harmonize { 142sub harmonize {
127 my ($vals) = @_; 143 my ($vals) = @_;
… …
133 $rem += $_ - $i; 149 $rem += $_ - $i;
134 $_ = $i; 150 $_ = $i;
135 } 151 }
136} 152}
137 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
138############################################################################# 195#############################################################################
139 196
140package CFClient::UI::Base; 197package CFClient::UI::Base;
141 198
142use strict; 199use strict;
… …
145 202
146sub new { 203sub new {
147 my $class = shift; 204 my $class = shift;
148 205
149 my $self = bless { 206 my $self = bless {
150 x => 0, 207 x => "center",
151 y => 0, 208 y => "center",
152 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
153 can_events => 1, 212 can_events => 1,
154 @_ 213 @_
155 }, $class; 214 }, $class;
156 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
157 for (keys %$self) { 218 for (keys %$self) {
158 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
160 } 221 }
161 } 222 }
162 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
163 $self 236 $self
164} 237}
165 238
166sub destroy { 239sub destroy {
167 my ($self) = @_; 240 my ($self) = @_;
… …
176 return if $self->{parent}; 249 return if $self->{parent};
177 250
178 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
179} 252}
180 253
181sub hide { 254sub set_visible {
182 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};
183 278
184 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
186 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
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
214 339
215sub configure { 340sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
217 342
218 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
221 348
222 # use alignment to adjust x, y 349 # use alignment to adjust x, y
223 350
224 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 353 }
229 354
230 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 356 $self->{x} = $x;
232 $self->{y} = $y; 357 $self->{y} = $y;
233 $self->update; 358 $self->update;
234 } 359 }
235 360
236 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
237 $self->{w} = $w; 364 $self->{alloc_w} = $w;
238 $self->{h} = $h; 365 $self->{alloc_h} = $h;
239 366
240 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 368 }
244} 369}
245 370
246sub size_allocate { 371sub size_allocate {
247 # nothing to be done 372 # nothing to be done
248} 373}
249 374
250sub children { 375sub children {
251} 376}
252 377
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
261}
262
263sub set_max_size { 378sub set_max_size {
264 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
265 380
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
268} 383}
269 384
270# return top left coordinates 385sub set_tooltip {
271sub _topleft {
272 my ($self, $x, $y) = @_; 386 my ($self, $tooltip) = @_;
273 387
274 $self->{parent} 388 $tooltip =~ s/^\s+//;
275 or Carp::confess "no parent widget in _topleft\n";#d# 389 $tooltip =~ s/\s+$//;
276 390
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 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 }
278} 399}
279 400
280# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
281sub coord2local { 402sub coord2local {
282 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
283 404
284 my ($X, $Y) = $self->_topleft; 405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 406}
287 407
288# translate local coordinates to global coordinate system 408# translate local coordinates to global coordinate system
289sub coord2global { 409sub coord2global {
290 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
291 411
292 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 413}
295 414
296sub focus_in { 415sub focus_in {
297 my ($self) = @_; 416 my ($self) = @_;
298 417
299 return if $FOCUS == $self; 418 return if $FOCUS == $self;
300 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
301 420
302 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
303 422
304 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
305 424
306 $focus->update if $focus; 425 $focus->update if $focus;
307 $FOCUS->update; 426 $FOCUS->update;
308} 427}
309 428
… …
312 431
313 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
314 433
315 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
316 435
317 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
318 437
319 $focus->update if $focus; #? 438 $focus->update if $focus; #?
320}
321 439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
442}
443
322sub mouse_motion { } 444sub mouse_motion { 0 }
323sub button_up { } 445sub button_up { 0 }
324sub key_down { } 446sub key_down { 0 }
325sub key_up { } 447sub key_up { 0 }
326 448
327sub button_down { 449sub button_down {
328 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
329 451
330 $self->focus_in; 452 $self->focus_in;
331}
332 453
333sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
334sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
335sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
336sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
337sub 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
338 530
339sub draw { 531sub draw {
340 my ($self) = @_; 532 my ($self) = @_;
341 533
342 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);
343 545
344 glPushMatrix; 546 glPushMatrix;
345 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
346 $self->_draw; 548 $self->_draw;
347 glPopMatrix; 549 glPopMatrix;
… …
359 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
360 glEnd; 562 glEnd;
361 glDisable GL_BLEND; 563 glDisable GL_BLEND;
362 } 564 }
363 565
364 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
365 glPushMatrix; 567 glPushMatrix;
366 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0; 571 glVertex 0 , 0;
370 glVertex $self->{w}, 0; 572 glVertex $self->{w} - 1, 0;
371 glVertex $self->{w}, $self->{h}; 573 glVertex $self->{w} - 1, $self->{h} - 1;
372 glVertex 0 , $self->{h}; 574 glVertex 0 , $self->{h} - 1;
373 glEnd; 575 glEnd;
374 glPopMatrix; 576 glPopMatrix;
375 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;
376 } 578 }
377} 579}
378 580
379sub _draw { 581sub _draw {
380 my ($self) = @_; 582 my ($self) = @_;
381 583
382 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
383} 585}
384 586
385sub find_widget {
386 my ($self, $x, $y) = @_;
387
388 return () unless $self->{can_events};
389
390 return $self
391 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
392 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
393
394 ()
395}
396
397sub set_parent {
398 my ($self, $parent) = @_;
399
400 Scalar::Util::weaken ($self->{parent} = $parent);
401}
402
403sub check_size {
404 my ($self) = @_;
405
406 $self->{parent}
407 or return 1;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427}
428
429sub update {
430 my ($self) = @_;
431
432 $self->{parent}->update
433 if $self->{parent};
434}
435
436sub connect {
437 my ($self, $signal, $cb) = @_;
438
439 push @{ $self->{signal_cb}{$signal} }, $cb;
440}
441
442sub emit {
443 my ($self, $signal, @args) = @_;
444
445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
446}
447
448sub DESTROY { 587sub DESTROY {
449 my ($self) = @_; 588 my ($self) = @_;
450 589
590 delete $WIDGET{$self+0};
451 #$self->deactivate; 591 #$self->deactivate;
452} 592}
453 593
454############################################################################# 594#############################################################################
455 595
… …
464 my $class = shift; 604 my $class = shift;
465 605
466 # range [value, low, high, page] 606 # range [value, low, high, page]
467 607
468 $class->SUPER::new ( 608 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 609 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 610 #active_bg => [1, 1, 1, 0.5],
471 @_ 611 @_
472 ) 612 )
473} 613}
474 614
475sub _draw { 615sub _draw {
476 my ($self) = @_; 616 my ($self) = @_;
477 617
618 my $color = $FOCUS == $self && $self->{active_bg}
619 ? $self->{active_bg}
620 : $self->{bg};
621
622 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 623 my ($w, $h) = @$self{qw(w h)};
479 624
480 glEnable GL_BLEND; 625 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 627 glColor @$color;
483 628
484 glBegin GL_QUADS; 629 glBegin GL_QUADS;
485 glVertex 0 , 0; 630 glVertex 0 , 0;
486 glVertex 0 , $h; 631 glVertex 0 , $h;
487 glVertex $w, $h; 632 glVertex $w, $h;
488 glVertex $w, 0; 633 glVertex $w, 0;
489 glEnd; 634 glEnd;
490 635
491 glDisable GL_BLEND; 636 glDisable GL_BLEND;
637 }
492} 638}
493 639
494############################################################################# 640#############################################################################
495 641
496package CFClient::UI::Empty; 642package CFClient::UI::Empty;
… …
501 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
502 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
503} 649}
504 650
505sub size_request { 651sub size_request {
506 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
507} 655}
508 656
509sub draw { } 657sub draw { }
510 658
511############################################################################# 659#############################################################################
… …
528 676
529 $self 677 $self
530} 678}
531 679
532sub add { 680sub add {
533 my ($self, $child) = @_; 681 my ($self, @widgets) = @_;
534 682
535 $child->set_parent ($self); 683 $_->set_parent ($self)
684 for @widgets;
536 685
537 use sort 'stable'; 686 use sort 'stable';
538 687
539 $self->{children} = [ 688 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 690 @{$self->{children}}, @widgets
542 ]; 691 ];
543 692
544 $child->check_size; 693 $self->realloc;
545 $self->update;
546} 694}
547 695
548sub children { 696sub children {
549 @{ $_[0]{children} } 697 @{ $_[0]{children} }
550} 698}
… …
555 delete $child->{parent}; 703 delete $child->{parent};
556 $child->hide; 704 $child->hide;
557 705
558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559 707
560 $self->check_size; 708 $self->realloc;
561 $self->update;
562} 709}
563 710
564sub clear { 711sub clear {
565 my ($self) = @_; 712 my ($self) = @_;
566 713
… …
570 for (@$children) { 717 for (@$children) {
571 delete $_->{parent}; 718 delete $_->{parent};
572 $_->hide; 719 $_->hide;
573 } 720 }
574 721
575 $self->check_size; 722 $self->realloc;
576 $self->update;
577} 723}
578 724
579sub find_widget { 725sub find_widget {
580 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
581 727
… …
656} 802}
657 803
658sub update { 804sub update {
659 my ($self) = @_; 805 my ($self) = @_;
660 806
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 807 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 808 $self->SUPER::update;
663} 809}
664 810
665sub size_allocate { 811sub size_allocate {
666 my ($self, $w, $h) = @_; 812 my ($self, $w, $h) = @_;
… …
668 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
669 $self->update; 815 $self->update;
670} 816}
671 817
672sub _render { 818sub _render {
819 my ($self) = @_;
820
673 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
674} 822}
675 823
676sub render_child { 824sub render_child {
677 my ($self) = @_; 825 my ($self) = @_;
678 826
679 $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 {
680 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
682 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
683 $self->_render; 838 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 }; 839 };
692} 840}
693 841
694sub _draw { 842sub _draw {
695 my ($self) = @_; 843 my ($self) = @_;
696 844
697 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
698 846
699 my $tex = $self->{texture} 847 my $tex = $self->{texture}
700 or return; 848 or return;
701 849
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 852 glColor 1, 1, 1, 1;
707 853
708 $tex->draw_quad (0, 0, $w, $h); 854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 855
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 856 glDisable GL_TEXTURE_2D;
712} 857}
713 858
714############################################################################# 859#############################################################################
715 860
716package CFClient::UI::ViewPort; 861package CFClient::UI::ViewPort;
717 862
718our @ISA = CFClient::UI::Window::; 863our @ISA = CFClient::UI::Window::;
719 864
865sub new {
866 my $class = shift;
867
868 $class->SUPER::new (
869 scroll_x => 0,
870 scroll_y => 1,
871 @_,
872 )
873}
874
720sub size_request { 875sub size_request {
721 my ($self) = @_; 876 my ($self) = @_;
722 877
723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
725 879
726 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
727} 884}
728 885
729sub size_allocate { 886sub size_allocate {
730 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
731 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);
732 $self->update; 895 $self->update;
733} 896}
734 897
735sub set_offset { 898sub set_offset {
736 my ($self, $x, $y) = @_; 899 my ($self, $x, $y) = @_;
… …
739 $self->{view_y} = int $y; 902 $self->{view_y} = int $y;
740 903
741 $self->update; 904 $self->update;
742} 905}
743 906
744# hmm, this does not work for topleft of $self... but we should not aks for that 907# hmm, this does not work for topleft of $self... but we should not ask for that
745sub _topleft { 908sub coord2local {
746 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
747 910
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 911 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
912}
913
914sub coord2global {
915 my ($self, $x, $y) = @_;
916
917 $x = List::Util::min $self->{w}, $x - $self->{view_x};
918 $y = List::Util::min $self->{h}, $y - $self->{view_y};
919
920 $self->SUPER::coord2global ($x, $y)
749} 921}
750 922
751sub find_widget { 923sub find_widget {
752 my ($self, $x, $y) = @_; 924 my ($self, $x, $y) = @_;
753 925
… …
761} 933}
762 934
763sub _render { 935sub _render {
764 my ($self) = @_; 936 my ($self) = @_;
765 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
766 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767 942
768 $self->SUPER::_render; 943 $self->SUPER::_render;
769} 944}
770 945
… …
778 my $class = shift; 953 my $class = shift;
779 954
780 my $self; 955 my $self;
781 956
782 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
783 vertical => 1, 958 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub { 960 on_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 961 $self->{vp}->set_offset (0, $_[1]);
787 }, 962 },
788 ; 963 ;
789 964
790 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort), 966 vp => (new CFClient::UI::ViewPort expand => 1),
792 slider => $slider, 967 slider => $slider,
793 @_, 968 @_,
794 ); 969 );
795 970
796 $self->{vp}->add ($self->{scrolled}); 971 $self->{vp}->add ($self->{scrolled});
… …
798 $self->add ($self->{slider}); 973 $self->add ($self->{slider});
799 974
800 $self 975 $self
801} 976}
802 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
803#TODO# update range on size_allocate depeneing on child 997#TODO# update range on size_allocate depending on child
804# update viewport offset on scroll 998# update viewport offset on scroll
805 999
806############################################################################# 1000#############################################################################
807 1001
808package CFClient::UI::Frame; 1002package CFClient::UI::Frame;
… …
812use CFClient::OpenGL; 1006use CFClient::OpenGL;
813 1007
814sub new { 1008sub new {
815 my $class = shift; 1009 my $class = shift;
816 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
817 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
818 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
819 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
820 border => 0.8, 1064 border => 0.6,
821 @_ 1065 can_events => 1,
1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
822 ); 1069 );
823 1070
824 $self
825}
826
827sub _draw {
828 my ($self) = @_;
829
830 my ($w, $h) = ($self->{w}, $self->{h});
831
832 glEnable GL_BLEND;
833 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
834 glEnable GL_TEXTURE_2D;
835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
836
837# glBegin GL_QUADS;
838# glColor 0, 0, 0, 0;
839# glVertex 0 , 0;
840# glVertex 0 , $h;
841# glVertex $w, $h;
842# glVertex $w, 0;
843# glEnd;
844
845
846 $self->child->draw;
847 glDisable GL_BLEND;
848 glDisable GL_TEXTURE_2D;
849}
850
851#############################################################################
852
853package CFClient::UI::FancyFrame;
854
855our @ISA = CFClient::UI::Bin::;
856
857use CFClient::OpenGL;
858
859my @tex =
860 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
861 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
862
863sub new {
864 my $class = shift;
865
866 # TODO: user_x, user_y, overwrite moveto?
867
868 my $self = $class->SUPER::new (
869 bg => [1, 1, 1, 1],
870 border_bg => [1, 1, 1, 1],
871 border => 0.6,
872 can_events => 1,
873 @_
874 );
875
876 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
877 align => 0, 1072 align => 0,
878 valign => 1, 1073 valign => 1,
879 text => $self->{title}, 1074 text => $title,
880 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
881 1077
882 $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};
883} 1086}
884 1087
885sub border { 1088sub border {
886 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
887} 1090}
888 1091
889sub size_request { 1092sub size_request {
890 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
891 1097
892 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
893 1099
894 ( 1100 (
895 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
898} 1104}
899 1105
900sub size_allocate { 1106sub size_allocate {
901 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
902 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
903 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
904 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
905 1119
906 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
907 if $self->{title};
908
909 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
910} 1121}
911 1122
912sub button_down { 1123sub button_down {
913 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
914 1125
… …
930 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
931 1142
932 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
933 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
934 1145
935 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
936 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
937 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
938 $self->check_size;
939 }; 1151 };
940 1152
941 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
942 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
943 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
… …
945 $self->{motion} = sub { 1157 $self->{motion} = sub {
946 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
947 1159
948 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
949 1161
950 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
951 $self->update;
952 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
953 } 1168 1
954} 1169}
955 1170
956sub button_up { 1171sub button_up {
957 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
958 1173
959 delete $self->{motion}; 1174 !!delete $self->{motion}
960} 1175}
961 1176
962sub mouse_motion { 1177sub mouse_motion {
963 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
964 1179
965 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
966} 1183}
967 1184
968sub _draw { 1185sub _draw {
969 my ($self) = @_; 1186 my ($self) = @_;
970 1187
1188 my $child = $self->{children}[0];
1189
971 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
972 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
973 1192
974 glEnable GL_BLEND;
975 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
976 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
978 1195
979 my $border = $self->border; 1196 my $border = $self->border;
980 1197
981 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
982 $tex[1]->draw_quad (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
983 $tex[3]->draw_quad (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
985 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
986 1203
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
988 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
989 1206
990 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
991 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
992 my $rep_y = $ch / $bg->{h}; 1210 $bg->{t} = $ch / $bg->{h};
993
994 glColor @{ $self->{bg} };
995
996 $bg->{s} = $rep_x;
997 $bg->{t} = $rep_y;
998 $bg->{wrap_mode} = 1;
999 $bg->draw_quad ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1212 }
1000 1213
1001 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND;
1003 }
1004 1215
1005 $self->{title}->draw if $self->{title};
1006
1007 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
1008} 1222}
1009 1223
1010############################################################################# 1224#############################################################################
1011 1225
1012package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
1020sub new { 1234sub new {
1021 my $class = shift; 1235 my $class = shift;
1022 1236
1023 $class->SUPER::new ( 1237 $class->SUPER::new (
1024 col_expand => [], 1238 col_expand => [],
1025 @_ 1239 @_,
1026 ) 1240 )
1241}
1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1027} 1245}
1028 1246
1029sub add { 1247sub add {
1030 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1031 1249
1032 $child->set_parent ($self); 1250 $child->set_parent ($self);
1033 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1034 1252
1035 $child->check_size; 1253 $self->realloc;
1036} 1254}
1037 1255
1038sub children {
1039 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040}
1041
1042# 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?
1043sub clear { 1257sub clear {
1044 my ($self) = @_; 1258 my ($self) = @_;
1045 1259
1046 my @children = $self->children; 1260 my @children = $self->children;
1047 delete $self->{children}; 1261 delete $self->{children};
… …
1049 for (@children) { 1263 for (@children) {
1050 delete $_->{parent}; 1264 delete $_->{parent};
1051 $_->hide; 1265 $_->hide;
1052 } 1266 }
1053 1267
1054 $self->update; 1268 $self->realloc;
1055} 1269}
1056 1270
1057sub get_wh { 1271sub get_wh {
1058 my ($self) = @_; 1272 my ($self) = @_;
1059 1273
… …
1090sub size_allocate { 1304sub size_allocate {
1091 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
1092 1306
1093 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
1094 1308
1095 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
1096 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
1097 1311
1098 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
1099 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
1100 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
1101 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1155 } 1369 }
1156} 1370}
1157 1371
1158############################################################################# 1372#############################################################################
1159 1373
1160package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1161
1162# TODO: wrap into common Box base class
1163 1375
1164our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1165 1377
1166sub size_request { 1378sub size_request {
1167 my ($self) = @_; 1379 my ($self) = @_;
1168 1380
1169 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1170 1382 ? (
1171 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1172 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1173 (List::Util::max map $_->[1], @alloc), 1385 )
1174 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1175} 1390}
1176 1391
1177sub size_allocate { 1392sub size_allocate {
1178 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1179 1394
1180 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1181
1182 my $children = $self->{children}; 1396 my $children = $self->{children};
1183 1397
1184 my @h = map $_->{req_w}, @$children; 1398 my @req;
1185 1399
1186 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1187 1401 @req = ($space / (@$children || 1)) x @$children;
1188 if ($req_h > $h) {
1189 # ah well, not enough space
1190 $_ *= $h / $req_h for @h;
1191 } 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 {
1192 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1193 $exp ||= 1;
1194 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1195 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1196 my $child = $children->[$_];
1197
1198 my $alloc_h = $h[$_];
1199 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1200 $h[$_] = $alloc_h;
1201 } 1416 }
1202 } 1417 }
1203 1418
1204 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1205 1420
1206 my $y = 0; 1421 my $pos = 0;
1207 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1208 my $child = $children->[$_];
1209 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1210 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1211 1425
1212 $y += $h; 1426 $pos += $alloc;
1213 } 1427 }
1214 1428
1215 1 1429 1
1216} 1430}
1217 1431
1218############################################################################# 1432#############################################################################
1219 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
1220package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1221 1450
1222# TODO: wrap into common Box base class
1223
1224our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1225 1452
1226sub size_request { 1453sub new {
1227 my ($self) = @_; 1454 my $class = shift;
1228 1455
1229 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1230 1457 vertical => 1,
1231 ( 1458 @_,
1232 (List::Util::max map $_->[0], @alloc),
1233 (List::Util::sum map $_->[1], @alloc),
1234 ) 1459 )
1235} 1460}
1236 1461
1237sub size_allocate {
1238 my ($self, $w, $h) = @_;
1239
1240 my $children = $self->{children};
1241
1242 my @h = map $_->{req_h}, @$children;
1243
1244 my $req_h = List::Util::sum @h;
1245
1246 if ($req_h > $h) {
1247 # ah well, not enough space
1248 $_ *= $h / $req_h for @h;
1249 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children;
1251 $exp ||= 1;
1252
1253 for (0 .. $#$children) {
1254 my $child = $children->[$_];
1255
1256 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1257 }
1258 }
1259
1260 CFClient::UI::harmonize \@h;
1261
1262 my $y = 0;
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265 my $h = $h[$_];
1266 $child->configure (0, $y, $w, $h);
1267
1268 $y += $h;
1269 }
1270
1271 1
1272}
1273
1274############################################################################# 1462#############################################################################
1275 1463
1276package CFClient::UI::Label; 1464package CFClient::UI::Label;
1277 1465
1278our @ISA = CFClient::UI::Base::; 1466our @ISA = CFClient::UI::DrawBG::;
1279 1467
1280use CFClient::OpenGL; 1468use CFClient::OpenGL;
1281 1469
1282sub new { 1470sub new {
1283 my ($class, %arg) = @_; 1471 my ($class, %arg) = @_;
1284 1472
1285 my $self = $class->SUPER::new ( 1473 my $self = $class->SUPER::new (
1286 fg => [1, 1, 1], 1474 fg => [1, 1, 1],
1475 #bg => none
1476 #active_bg => none
1287 #font => default_font 1477 #font => default_font
1478 #text => initial text
1479 #markup => initial narkup
1480 #max_w => maximum pixel width
1481 ellipsise => 3, # end
1482 layout => (new CFClient::Layout),
1288 fontsize => 1, 1483 fontsize => 1,
1289 text => "",
1290 align => -1, 1484 align => -1,
1291 valign => -1, 1485 valign => -1,
1292 padding => 2, 1486 padding_x => 2,
1293 layout => new CFClient::Layout, 1487 padding_y => 2,
1294 can_events => 0, 1488 can_events => 0,
1295 %arg 1489 %arg
1296 ); 1490 );
1297 1491
1298 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
1299 my $layout = new CFClient::Layout; 1493 my $layout = new CFClient::Layout;
1300 $layout->set_text (delete $self->{template}); 1494 $layout->set_text (delete $self->{template});
1301 $self->{template} = $layout; 1495 $self->{template} = $layout;
1302 } 1496 }
1303 1497
1304 $self->set_text (delete $self->{text}) if exists $self->{text}; 1498 if (exists $self->{markup}) {
1305 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1499 $self->set_markup (delete $self->{markup});
1500 } else {
1501 $self->set_text (delete $self->{text});
1502 }
1306 1503
1307 $self 1504 $self
1308} 1505}
1309 1506
1310sub escape { 1507sub escape($) {
1311 local $_ = $_[1]; 1508 local $_ = $_[0];
1312 1509
1313 s/&/&amp;/g; 1510 s/&/&amp;/g;
1314 s/>/&gt;/g; 1511 s/>/&gt;/g;
1315 s/</&lt;/g; 1512 s/</&lt;/g;
1316 1513
1317 $_[1] 1514 $_
1318} 1515}
1319 1516
1320sub update { 1517sub update {
1321 my ($self) = @_; 1518 my ($self) = @_;
1322 1519
1323 delete $self->{texture}; 1520 delete $self->{texture};
1324 $self->SUPER::update; 1521 $self->SUPER::update;
1325} 1522}
1326 1523
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
1333sub set_text { 1524sub set_text {
1334 my ($self, $text) = @_; 1525 my ($self, $text) = @_;
1335 1526
1336 return if $self->{text} eq "T$text"; 1527 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1338 1529
1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1339 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1340 1532
1341 delete $self->{texture}; 1533 $self->realloc;
1342 $self->update; 1534 $self->update;
1343 $self->check_size;
1344} 1535}
1345 1536
1346sub set_markup { 1537sub set_markup {
1347 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1348 1539
1349 return if $self->{text} eq "M$markup"; 1540 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup"; 1541 $self->{text} = "M$markup";
1351 1542
1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1544
1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1352 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1353 1547
1354 delete $self->{texture}; 1548 $self->realloc;
1355 $self->update; 1549 $self->update;
1356 $self->check_size;
1357} 1550}
1358 1551
1359sub size_request { 1552sub size_request {
1360 my ($self) = @_; 1553 my ($self) = @_;
1361 1554
1362 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1555 $self->{layout}->set_font ($self->{font}) if $self->{font};
1363 $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});
1364 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1365 1560
1366 my ($w, $h) = $self->{layout}->size; 1561 my ($w, $h) = $self->{layout}->size;
1367 1562
1368 if (exists $self->{template}) { 1563 if (exists $self->{template}) {
… …
1373 1568
1374 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1375 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1376 } 1571 }
1377 1572
1378 ( 1573 ($w, $h)
1379 $w + $self->{padding} * 2,
1380 $h + $self->{padding} * 2,
1381 )
1382} 1574}
1383 1575
1384sub size_allocate { 1576sub size_allocate {
1385 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1386 1578
1579 delete $self->{ox};
1580
1387 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1388} 1583}
1389 1584
1390sub set_fontsize { 1585sub set_fontsize {
1391 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1392 1587
1393 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1394 delete $self->{texture}; 1589 delete $self->{texture};
1395 $self->check_size; 1590
1396 $self->update; 1591 $self->realloc;
1397} 1592}
1398 1593
1399sub _draw { 1594sub _draw {
1400 my ($self) = @_; 1595 my ($self) = @_;
1401 1596
1597 $self->SUPER::_draw; # draw background, if applicable
1598
1402 my $tex = $self->{texture} ||= do { 1599 my $tex = $self->{texture} ||= do {
1600 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1601 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $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});
1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1606
1406 new_from_layout CFClient::Texture $self->{layout} 1607 new_from_layout CFClient::Texture $self->{layout}
1407 }; 1608 };
1408 1609
1409 glEnable GL_BLEND; 1610 unless (exists $self->{ox}) {
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1613 : ($self->{w} - $tex->{w}) * 0.5);
1614
1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1617 : ($self->{h} - $tex->{h}) * 0.5);
1618 };
1619
1411 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1622
1623 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1624 glColor @{$self->{fg}};
1415
1416 $self->{ox} = int (
1417 $self->{align} < 0 ? $self->{padding}
1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1421
1422 $self->{oy} = int (
1423 $self->{valign} < 0 ? $self->{padding}
1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1427
1428 $tex->draw_quad ($self->{ox}, $self->{oy}); 1625 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1626 } else {
1627 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1628 }
1429 1629
1430 glDisable GL_TEXTURE_2D; 1630 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1631}
1433 1632
1434############################################################################# 1633#############################################################################
1435 1634
1436package CFClient::UI::EntryBase; 1635package CFClient::UI::EntryBase;
… …
1449 active_fg => [0, 0, 0], 1648 active_fg => [0, 0, 0],
1450 can_hover => 1, 1649 can_hover => 1,
1451 can_focus => 1, 1650 can_focus => 1,
1452 valign => 0, 1651 valign => 0,
1453 can_events => 1, 1652 can_events => 1,
1653 #text => ...
1454 @_ 1654 @_
1455 ) 1655 )
1456} 1656}
1457 1657
1458sub _set_text { 1658sub _set_text {
… …
1468 $self->{text} = $text; 1668 $self->{text} = $text;
1469 1669
1470 $text =~ s/./*/g if $self->{hidden}; 1670 $text =~ s/./*/g if $self->{hidden};
1471 $self->{layout}->set_text ("$text "); 1671 $self->{layout}->set_text ("$text ");
1472 1672
1473 $self->emit (changed => $self->{text}); 1673 $self->_emit (changed => $self->{text});
1674}
1675
1676sub set_text {
1677 my ($self, $text) = @_;
1678
1679 $self->{cursor} = length $text;
1680 $self->_set_text ($text);
1681
1682 $self->realloc;
1474} 1683}
1475 1684
1476sub get_text { 1685sub get_text {
1477 $_[0]{text} 1686 $_[0]{text}
1478} 1687}
… …
1481 my ($self) = @_; 1690 my ($self) = @_;
1482 1691
1483 my ($w, $h) = $self->SUPER::size_request; 1692 my ($w, $h) = $self->SUPER::size_request;
1484 1693
1485 ($w + 1, $h) # add 1 for cursor 1694 ($w + 1, $h) # add 1 for cursor
1486}
1487
1488sub size_allocate {
1489 my ($self, $w, $h) = @_;
1490
1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492}
1493
1494sub set_text {
1495 my ($self, $text) = @_;
1496
1497 $self->{cursor} = length $text;
1498 $self->_set_text ($text);
1499 $self->update;
1500} 1695}
1501 1696
1502sub key_down { 1697sub key_down {
1503 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1504 1699
… …
1506 my $sym = $ev->{sym}; 1701 my $sym = $ev->{sym};
1507 my $uni = $ev->{unicode}; 1702 my $uni = $ev->{unicode};
1508 1703
1509 my $text = $self->get_text; 1704 my $text = $self->get_text;
1510 1705
1511 if ($sym == 8) { 1706 if ($uni == 8) {
1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1707 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513 } elsif ($sym == 127) { 1708 } elsif ($uni == 127) {
1514 substr $text, $self->{cursor}, 1, ""; 1709 substr $text, $self->{cursor}, 1, "";
1515 } elsif ($sym == CFClient::SDLK_LEFT) { 1710 } elsif ($sym == CFClient::SDLK_LEFT) {
1516 --$self->{cursor} if $self->{cursor}; 1711 --$self->{cursor} if $self->{cursor};
1517 } elsif ($sym == CFClient::SDLK_RIGHT) { 1712 } elsif ($sym == CFClient::SDLK_RIGHT) {
1518 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1713 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1519 } elsif ($sym == CFClient::SDLK_HOME) { 1714 } elsif ($sym == CFClient::SDLK_HOME) {
1520 $self->{cursor} = 0; 1715 $self->{cursor} = 0;
1521 } elsif ($sym == CFClient::SDLK_END) { 1716 } elsif ($sym == CFClient::SDLK_END) {
1522 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1523 } elsif ($sym == 27) { 1718 } elsif ($uni == 27) {
1524 $self->emit ('escape'); 1719 $self->_emit ('escape');
1525 } elsif ($uni) { 1720 } elsif ($uni) {
1526 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1527 } 1724 }
1528 1725
1529 $self->_set_text ($text); 1726 $self->_set_text ($text);
1530 $self->update; 1727
1728 $self->realloc;
1729
1730 1
1531} 1731}
1532 1732
1533sub focus_in { 1733sub focus_in {
1534 my ($self) = @_; 1734 my ($self) = @_;
1535 1735
… …
1550 utf8::encode $text; 1750 utf8::encode $text;
1551 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1552 1752
1553 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1554 $self->update; 1754 $self->update;
1755
1756 1
1555} 1757}
1556 1758
1557sub mouse_motion { 1759sub mouse_motion {
1558 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1559# 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
1560} 1764}
1561 1765
1562sub _draw { 1766sub _draw {
1563 my ($self) = @_; 1767 my ($self) = @_;
1564 1768
… …
1615 if ($sym == 13) { 1819 if ($sym == 13) {
1616 unshift @{$self->{history}}, 1820 unshift @{$self->{history}},
1617 my $txt = $self->get_text; 1821 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1; 1822 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = ''; 1823 $self->{history_saveback} = '';
1620 $self->emit (activate => $txt); 1824 $self->_emit (activate => $txt);
1621 $self->update; 1825 $self->update;
1622 1826
1623 } elsif ($sym == CFClient::SDLK_UP) { 1827 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) { 1828 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text; 1829 $self->{history_saveback} = $self->get_text;
… …
1641 } else { 1845 } else {
1642 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1643 } 1847 }
1644 1848
1645 } else { 1849 } else {
1646 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1647 } 1853 1
1648
1649} 1854}
1650 1855
1651############################################################################# 1856#############################################################################
1652 1857
1653package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1662 1867
1663sub new { 1868sub new {
1664 my $class = shift; 1869 my $class = shift;
1665 1870
1666 $class->SUPER::new ( 1871 $class->SUPER::new (
1667 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1668 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1669 bg => [1, 1, 1, 0.2],
1670 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1671 can_hover => 1, 1876 can_hover => 1,
1672 align => 0, 1877 align => 0,
1673 valign => 0, 1878 valign => 0,
1674 can_events => 1, 1879 can_events => 1,
1675 @_ 1880 @_
1676 ) 1881 )
1677} 1882}
1678 1883
1884sub activate { }
1885
1679sub button_up { 1886sub button_up {
1680 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1681 1888
1889 $self->emit ("activate")
1682 if ($x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1683 && $y >= 0 && $y < $self->{h}) { 1891 && $y >= 0 && $y < $self->{h};
1684 $self->emit ("activate"); 1892
1685 } 1893 1
1686} 1894}
1687 1895
1688sub _draw { 1896sub _draw {
1689 my ($self) = @_; 1897 my ($self) = @_;
1690 1898
… …
1692 1900
1693 if ($GRAB == $self) { 1901 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1902 $self->{fg} = $self->{active_fg};
1695 } 1903 }
1696 1904
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1905 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1907 glColor 0, 0, 0, 1;
1702 1908
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1909 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1910
1705 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1912
1708 $self->SUPER::_draw; 1913 $self->SUPER::_draw;
1709} 1914}
1710 1915
1711############################################################################# 1916#############################################################################
… …
1722 1927
1723sub new { 1928sub new {
1724 my $class = shift; 1929 my $class = shift;
1725 1930
1726 $class->SUPER::new ( 1931 $class->SUPER::new (
1727 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1728 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1729 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],
1730 state => 0, 1938 state => 0,
1731 can_hover => 1, 1939 can_hover => 1,
1732 @_ 1940 @_
1733 ) 1941 )
1734} 1942}
1735 1943
1736sub size_request { 1944sub size_request {
1737 my ($self) = @_; 1945 my ($self) = @_;
1738 1946
1739 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1740} 1948}
1741 1949
1742sub button_down { 1950sub button_down {
1743 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1744 1952
1745 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1746 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1747 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1748 $self->emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1749 } 1961 1
1750} 1962}
1751 1963
1752sub _draw { 1964sub _draw {
1753 my ($self) = @_; 1965 my ($self) = @_;
1754 1966
1755 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1756 1968
1757 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1758 1970
1759 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;
1760 1974
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1976
1763 glEnable GL_BLEND; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1978
1764 glEnable GL_TEXTURE_2D; 1979 glEnable GL_TEXTURE_2D;
1765 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767 my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769 $tex->draw_quad (0, 0, $s, $s); 1980 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1982}
1774 1983
1775############################################################################# 1984#############################################################################
1776 1985
1777package CFClient::UI::Image; 1986package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 2029 glTranslate 0, -$self->{w}, 0;
1821 2030
1822 ($w, $h) = ($h, $w); 2031 ($w, $h) = ($h, $w);
1823 } 2032 }
1824 2033
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 2034 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2035 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 2036
1830 $tex->draw_quad (0, 0, $w, $h); 2037 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 2038
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1834} 2040}
1835 2041
1836############################################################################# 2042#############################################################################
1837 2043
… …
2026 qw(s1_slider.png s1_slider_bg.png); 2232 qw(s1_slider.png s1_slider_bg.png);
2027 2233
2028sub new { 2234sub new {
2029 my $class = shift; 2235 my $class = shift;
2030 2236
2031 # range [value, low, high, page] 2237 # range [value, low, high, page, unit]
2032 2238
2033 # TODO: 0-width page 2239 # TODO: 0-width page
2034 # TODO: req_w/h are wrong with vertical 2240 # TODO: req_w/h are wrong with vertical
2035 # TODO: calculations are off 2241 # TODO: calculations are off
2036 my $self = $class->SUPER::new ( 2242 my $self = $class->SUPER::new (
2037 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2038 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],
2039 range => [0, 0, 100, 10], 2247 range => [0, 0, 100, 10, 0],
2040 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2041 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2042 vertical => 0, 2250 vertical => 0,
2043 can_hover => 1, 2251 can_hover => 1,
2044 inner_pad => 5, 2252 inner_pad => 0.02,
2045 @_ 2253 @_
2046 ); 2254 );
2047 2255
2256 $self->set_value ($self->{range}[0]);
2257 $self->update;
2258
2048 $self 2259 $self
2049} 2260}
2050 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
2051sub size_request { 2296sub size_request {
2052 my ($self) = @_; 2297 my ($self) = @_;
2053 2298
2054 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2055 my $h = $self->{req_h};
2056
2057 $self->{vertical} ? ($h, $w) : ($w, $h)
2058} 2300}
2059 2301
2060sub button_down { 2302sub button_down {
2061 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2062 2304
2063 $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
2064 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2065} 2310}
2066 2311
2067sub mouse_motion { 2312sub mouse_motion {
2068 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2069 2314
2070 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
2071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2336 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100;
2072 2338
2073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2339 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074 2340
2075 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2341 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2342 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077 2343
2078 $x -= $inner_pad_px; # substract the padding 2344 $value = ($value - $lo) / $range;
2079 $x = $x * ($hi - $lo) / $inner_w + $lo; 2345 $value = $value * $self->{scale} + $self->{offset};
2080 $x = $lo if $x < $lo;
2081 $x = $hi - $page if $x > $hi - $page;
2082 $self->{range}[0] = $x;
2083 2346
2084 $self->emit (changed => $x); 2347 $self->{knob_x} = $value - $knob_w * 0.5;
2085 $self->update; 2348 $self->{knob_w} = $knob_w;
2086 } 2349 });
2087}
2088 2350
2089# the inner_* stuff is for generating a padding for the slider handle, 2351 $self->SUPER::update;
2090# so that the handle doesn't leave the texture. This calculation isn't 100%
2091# correct propably, but it does the job for now
2092sub _calc_inner_pad_px {
2093 my ($self, $w) = @_;
2094 ($w / 100) * $self->{inner_pad} # % to pixels
2095} 2352}
2096 2353
2097sub _draw { 2354sub _draw {
2098 my ($self) = @_; 2355 my ($self) = @_;
2099 2356
2100 $self->SUPER::_draw (); 2357 $self->SUPER::_draw ();
2101 2358
2102 my ($w, $h) = @$self{qw(w h)}; 2359 glScale $self->{w}, $self->{h};
2103 2360
2104 if ($self->{vertical}) { 2361 if ($self->{vertical}) {
2105 # draw a vertical slider like a rotated horizontal slider 2362 # draw a vertical slider like a rotated horizontal slider
2106 2363
2364 glTranslate 1, 0, 0;
2107 glRotate 90, 0, 0, 1; 2365 glRotate 90, 0, 0, 1;
2108 glTranslate 0, -$self->{w}, 0;
2109
2110 ($w, $h) = ($h, $w);
2111 } 2366 }
2112 2367
2113 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2368 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2369 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115 2370
2116 my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118 $hi = $value + 1 if $lo == $hi;
2119
2120 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123 $page = int $page * $inner_w / ($hi - $lo);
2124 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126 $w -= $page;
2127 $page &= ~1;
2128 glTranslate $page * 0.5, 0, 0;
2129 $page ||= 2;
2130
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2371 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2372 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2373
2139 # draw background 2374 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2375 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141 2376
2142 # draw handle 2377 # draw handle
2143 $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);
2144 2379
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2147} 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 (@_) }
2148 2423
2149############################################################################# 2424#############################################################################
2150 2425
2151package CFClient::UI::TextView; 2426package CFClient::UI::TextView;
2152 2427
… …
2161 fontsize => 1, 2436 fontsize => 1,
2162 can_events => 0, 2437 can_events => 0,
2163 #font => default_font 2438 #font => default_font
2164 @_, 2439 @_,
2165 2440
2166 layout => (new CFClient::Layout), 2441 layout => (new CFClient::Layout 1),
2167 par => [], 2442 par => [],
2168 height => 0, 2443 height => 0,
2169 children => [ 2444 children => [
2170 (new CFClient::UI::Empty expand => 1), 2445 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2446 (new CFClient::UI::Slider vertical => 1),
… …
2182 2457
2183 $self->{fontsize} = $fontsize; 2458 $self->{fontsize} = $fontsize;
2184 $self->reflow; 2459 $self->reflow;
2185} 2460}
2186 2461
2187sub text_height {
2188 my ($self, $text) = @_;
2189
2190 my $layout = $self->{layout};
2191
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text);
2195
2196 ($layout->size)[1]
2197}
2198
2199sub reflow {
2200 my ($self) = @_;
2201
2202 $self->{need_reflow}++;
2203 $self->update;
2204}
2205
2206sub size_allocate { 2462sub size_allocate {
2207 my ($self, $w, $h) = @_; 2463 my ($self, $w, $h) = @_;
2208 2464
2209 $self->SUPER::size_allocate ($w, $h); 2465 $self->SUPER::size_allocate ($w, $h);
2210 2466
… …
2213 $self->{layout}->set_width ($self->{children}[0]{w}); 2469 $self->{layout}->set_width ($self->{children}[0]{w});
2214 2470
2215 $self->reflow; 2471 $self->reflow;
2216} 2472}
2217 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
2218sub add_paragraph { 2508sub add_paragraph {
2219 my ($self, $color, $text) = @_; 2509 my ($self, $color, $text, $indent) = @_;
2220 2510
2221 #TODO: intelligently "reformat" paragraph 2511 for my $line (split /\n/, $text) {
2222 2512 my ($w, $h) = $self->text_size ($line);
2223 my $height = $self->text_height ($text);
2224
2225 $self->{height} += $height; 2513 $self->{height} += $h;
2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2515 }
2226 2516
2227 push @{$self->{par}}, [$height, $color, $text];
2228
2229 $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]);
2230 $self->{children}[1]->update;
2231} 2518}
2232 2519
2233sub update { 2520sub update {
2234 my ($self) = @_; 2521 my ($self) = @_;
2235 2522
… …
2237 2524
2238 return unless $self->{h} > 0; 2525 return unless $self->{h} > 0;
2239 2526
2240 delete $self->{texture}; 2527 delete $self->{texture};
2241 2528
2242 $ROOT->on_refresh ($self, sub { 2529 $ROOT->on_post_alloc ($self, sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531
2243 if (delete $self->{need_reflow}) { 2532 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2533 my $height = 0;
2245 2534
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2247 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 }
2248 2550
2249 $self->{height} = $height; 2551 $self->{height} = $height;
2250 2552
2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252 2554
2253 delete $self->{texture}; 2555 delete $self->{texture};
2254 } 2556 }
2255 2557
2256 $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 {
2257 glClearColor 0, 0, 0, 0; 2559 glClearColor 0.5, 0.5, 0.5, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2560 glClear GL_COLOR_BUFFER_BIT;
2259 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
2260 glEnable GL_BLEND; 2573 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265 my $top = int $self->{children}[1]{range}[0];
2266
2267 my $y0 = $top;
2268 my $y1 = $top + $self->{h};
2269
2270 my $y = 0;
2271
2272 my $layout = $self->{layout};
2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275 2576
2276 for my $par (@{$self->{par}}) { 2577 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2578 my $h = $par->[1];
2278 2579
2279 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]);
2280 $layout->set_text ($par->[2]); 2583 $layout->set_markup ($par->[4]);
2281 2584
2282 glColor @{ $par->[1] }; 2585 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283 my ($W, $H) = $layout->size; 2586
2284 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;
2285 } 2589 }
2286 2590
2287 $y += $h; 2591 $y += $h;
2288 } 2592 }
2289 2593
2290 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND; 2594 glDisable GL_BLEND;
2292 }; 2595 };
2293 }); 2596 });
2294} 2597}
2295 2598
2296sub _draw { 2599sub _draw {
2297 my ($self) = @_; 2600 my ($self) = @_;
2298 2601
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2602 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2604 glColor 1, 1, 1, 1;
2304 $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});
2305 glDisable GL_TEXTURE_2D; 2606 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2607
2308 $self->{children}[1]->draw; 2608 $self->{children}[1]->draw;
2309 2609
2310} 2610}
2311 2611
… …
2359 2659
2360sub new { 2660sub new {
2361 my $class = shift; 2661 my $class = shift;
2362 2662
2363 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2364 state => 0, 2664 state => 0,
2365 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2366 @_ 2666 @_
2367 ); 2667 );
2368 2668
2369 if ($self->{state}) {
2370 $self->{state} = 0;
2371 $self->toggle_flopper;
2372 }
2373
2374 $self 2669 $self
2375} 2670}
2376 2671
2377sub toggle_flopper { 2672sub toggle_flopper {
2378 my ($self) = @_; 2673 my ($self) = @_;
2379 2674
2380 # TODO: use animation 2675 $self->{other}->toggle_visibility;
2381 if ($self->{state} = !$self->{state}) {
2382 $CFClient::UI::ROOT->add ($self->{other});
2383 $self->{other}->move ($self->coord2global (0, $self->{h}));
2384 $self->emit ("open");
2385 } else {
2386 $CFClient::UI::ROOT->remove ($self->{other});
2387 $self->emit ("close");
2388 }
2389
2390 $self->emit (changed => $self->{state});
2391} 2676}
2392 2677
2393############################################################################# 2678#############################################################################
2394 2679
2395package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2405 @_, 2690 @_,
2406 can_events => 0, 2691 can_events => 0,
2407 ) 2692 )
2408} 2693}
2409 2694
2410sub set_markup { 2695sub set_tooltip_from {
2411 my ($self, $text) = @_; 2696 my ($self, $widget) = @_;
2412 2697
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2698 my $tooltip = $widget->{tooltip};
2414 $self->{label}->set_markup ($text); 2699
2415 $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 );
2416} 2715}
2417 2716
2418sub size_request { 2717sub size_request {
2419 my ($self) = @_; 2718 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422 2719
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2720 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2721
2425 ($w + 4, $h + 4) 2722 ($w + 4, $h + 4)
2426} 2723}
… …
2429 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2430 2727
2431 $self->SUPER::size_allocate ($w - 4, $h - 4); 2728 $self->SUPER::size_allocate ($w - 4, $h - 4);
2432} 2729}
2433 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
2434sub _draw { 2749sub _draw {
2435 my ($self) = @_; 2750 my ($self) = @_;
2436 2751
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2752 glTranslate 0.375, 0.375;
2439 2753
2440 my ($w, $h) = @$self{qw(w h)}; 2754 my ($w, $h) = @$self{qw(w h)};
2441 2755
2442 glColor 1, 0.8, 0.4; 2756 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2767 glVertex 0 , $h;
2454 glVertex $w, $h; 2768 glVertex $w, $h;
2455 glVertex $w, 0; 2769 glVertex $w, 0;
2456 glEnd; 2770 glEnd;
2457 2771
2458 glPopMatrix; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2459 2773
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2462} 2775}
2463 2776
2464############################################################################# 2777#############################################################################
2465 2778
… …
2470use CFClient::OpenGL; 2783use CFClient::OpenGL;
2471 2784
2472sub new { 2785sub new {
2473 my $class = shift; 2786 my $class = shift;
2474 2787
2475 $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2476 aspect => 1, 2789 aspect => 1,
2790 can_events => 0,
2477 @_, 2791 @_,
2478 ) 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
2479} 2809}
2480 2810
2481sub size_request { 2811sub size_request {
2482 (32, 8) 2812 (32, 8)
2483} 2813}
2484 2814
2815sub update {
2816 my ($self) = @_;
2817
2818 return unless $self->{visible};
2819
2820 $self->SUPER::update;
2821}
2822
2485sub _draw { 2823sub _draw {
2486 my ($self) = @_; 2824 my ($self) = @_;
2487 2825
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
2488 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2489 2838
2490 # TODO animation
2491 if ($tex) { 2839 if ($tex) {
2492 glEnable GL_BLEND;
2493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2494 glEnable GL_TEXTURE_2D; 2840 glEnable GL_TEXTURE_2D;
2495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2496 glColor 1, 1, 1, 1; 2842 glColor 1, 1, 1, 1;
2497 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2498 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2499 glDisable GL_BLEND;
2500 } 2845 }
2846}
2847
2848sub DESTROY {
2849 my ($self) = @_;
2850
2851 $self->{timer}->cancel
2852 if $self->{timer};
2853
2854 $self->SUPER::DESTROY;
2501} 2855}
2502 2856
2503############################################################################# 2857#############################################################################
2504 2858
2505package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
… …
2540 2894
2541# 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)
2542sub popup { 2896sub popup {
2543 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2544 2898
2545 $self->emit ("popdown"); 2899 $self->_emit ("popdown");
2546 2900
2547 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self; 2902 $GRAB = $self;
2549 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2550 2904
2551 $self->show; 2905 $self->show;
2552 $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);
2553} 2907}
2554 2908
2555sub mouse_motion { 2909sub mouse_motion {
2556 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2557 2911
2558 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2559 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2560 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2561} 2917}
2562 2918
2563sub button_up { 2919sub button_up {
2564 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2565 2921
2566 if ($ev->{button} == $self->{button}) { 2922 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB; 2923 undef $GRAB;
2568 $self->hide; 2924 $self->hide;
2569 2925
2570 $self->emit ("popdown"); 2926 $self->_emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2572 } 2932 1
2573} 2933}
2574 2934
2575############################################################################# 2935#############################################################################
2576 2936
2937package CFClient::UI::Statusbox;
2938
2939our @ISA = CFClient::UI::VBox::;
2940
2941sub new {
2942 my $class = shift;
2943
2944 $class->SUPER::new (
2945 fontsize => 0.8,
2946 @_,
2947 )
2948}
2949
2950sub reorder {
2951 my ($self) = @_;
2952 my $NOW = time;
2953
2954 while (my ($k, $v) = each %{ $self->{item} }) {
2955 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956 }
2957
2958 my @widgets;
2959
2960 my @items = sort {
2961 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} };
2964
2965 my $count = 10 + 1;
2966 for my $item (@items) {
2967 last unless --$count;
2968
2969 push @widgets, $item->{label} ||= do {
2970 # TODO: doesn't handle markup well (read as: at all)
2971 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text};
2974
2975 for ($short) {
2976 s/^\s+//;
2977 s/\s+/ /g;
2978 }
2979
2980 new CFClient::UI::Label
2981 markup => $short,
2982 tooltip => $item->{tooltip},
2983 tooltip_font => $::FONT_PROP,
2984 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg},
2988 can_events => 1,
2989 can_hover => 1
2990 };
2991 }
2992
2993 $self->clear;
2994 $self->SUPER::add (reverse @widgets);
2995}
2996
2997sub add {
2998 my ($self, $text, %arg) = @_;
2999
3000 $text =~ s/^\s+//;
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},
3022 text => $text,
3023 timeout => $timeout,
3024 tooltip => $text,
3025 fg => [0.8, 0.8, 0.8, 0.8],
3026 pri => 0,
3027 count => 1,
3028 %arg,
3029 };
3030 }
3031
3032 $self->reorder;
3033}
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
3045#############################################################################
3046
3047package CFClient::UI::Inventory;
3048
3049our @ISA = CFClient::UI::ScrolledWindow::;
3050
3051sub new {
3052 my $class = shift;
3053
3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3056 @_,
3057 );
3058
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 {
3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3213
3214 $self->clear_command_list;
3215 $self->{recording} = 0;
3216 $self->{rec_btn}->set_text ("start recording");
3217
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 {
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}
3236
3237sub update_binding_widgets {
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
2577package CFClient::UI::Root; 3343package CFClient::UI::Root;
2578 3344
2579our @ISA = CFClient::UI::Container::; 3345our @ISA = CFClient::UI::Container::;
2580 3346
2581use CFClient::OpenGL; 3347use CFClient::OpenGL;
2582 3348
2583sub check_size { 3349sub new {
2584 my ($self) = @_; 3350 my $class = shift;
2585 3351
2586 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3352 my $self = $class->SUPER::new (
3353 visible => 1,
3354 @_,
3355 );
3356
3357 Scalar::Util::weaken ($self->{root} = $self);
3358
3359 $self
2587} 3360}
2588 3361
2589sub size_request { 3362sub size_request {
2590 ($::WIDTH, $::HEIGHT) 3363 my ($self) = @_;
2591}
2592 3364
2593sub configure { 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
3380}
3381
3382sub size_allocate {
2594 my ($self, $x, $y, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
2595 3384
2596 $self->SUPER::configure ($x, $y, $w, $h);
2597
2598 for my $child (@{$self->{children}}) { 3385 for my $child ($self->children) {
2599 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)};
2600 3387
2601 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3388 $X = $child->{force_x} if exists $child->{force_x};
2602 $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
2603 $child->configure ($X, $Y, $W,$H); 3394 $child->configure ($X, $Y, $W, $H);
2604 } 3395 }
2605} 3396}
2606 3397
2607sub _topleft { 3398sub coord2local {
2608 my ($self, $x, $y) = @_; 3399 my ($self, $x, $y) = @_;
2609 3400
2610 ($x, $y) 3401 ($x, $y)
2611} 3402}
2612 3403
3404sub coord2global {
3405 my ($self, $x, $y) = @_;
3406
3407 ($x, $y)
3408}
3409
2613sub update { 3410sub update {
2614 my ($self) = @_; 3411 my ($self) = @_;
2615 3412
2616 $self->check_size; 3413 $::WANT_REFRESH++;
2617 ::refresh ();
2618} 3414}
2619 3415
2620sub add { 3416sub add {
2621 my ($self, $child) = @_; 3417 my ($self, @children) = @_;
2622 3418
2623 # integerize window positions 3419 $_->{is_toplevel} = 1
2624 $child->{x} = int $child->{x}; 3420 for @children;
2625 $child->{y} = int $child->{y};
2626 3421
2627 $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 }
2628} 3438}
2629 3439
2630sub on_refresh { 3440sub on_refresh {
2631 my ($self, $id, $cb) = @_; 3441 my ($self, $id, $cb) = @_;
2632 3442
2633 $self->{refresh_hook}{$id} = $cb; 3443 $self->{refresh_hook}{$id} = $cb;
2634} 3444}
2635 3445
3446sub on_post_alloc {
3447 my ($self, $id, $cb) = @_;
3448
3449 $self->{post_alloc_hook}{$id} = $cb;
3450}
3451
2636sub draw { 3452sub draw {
2637 my ($self) = @_; 3453 my ($self) = @_;
2638 3454
2639 while (my $rcb = delete $self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
2640 $_->() for values %$rcb; 3456 $_->()
3457 for values %{delete $self->{refresh_hook}};
2641 } 3458 }
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
2642 3548
2643 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2644 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2645 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
2646 3552
2647 glMatrixMode GL_PROJECTION; 3553 glMatrixMode GL_PROJECTION;
2648 glLoadIdentity; 3554 glLoadIdentity;
2649 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2650 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
2651 glLoadIdentity; 3557 glLoadIdentity;
2652 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
2653 $self->_draw; 3566 $self->_draw;
2654} 3567}
2655 3568
2656############################################################################# 3569#############################################################################
2657 3570
2658package CFClient::UI::InventoryItem;
2659
2660our @ISA = CFClient::UI::HBox::;
2661
2662sub new {
2663 my $class = shift;
2664
2665 my %args = @_;
2666
2667 my $item = $args{item};
2668
2669 my $desc = $item->{nrof} < 2
2670 ? $item->{name}
2671 : "$item->{nrof} $item->{name_pl}";
2672
2673
2674 my $self = $class->SUPER::new (
2675 can_hover => 1,
2676 can_events => 1,
2677 tooltip => (CFClient::UI::Label->escape ($desc)
2678 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2679 connect_button_down => sub {
2680 my ($self, $ev, $x, $y) = @_;
2681
2682 # todo: maybe put examine on 1? but should just be a tooltip :(
2683 if ($ev->{button} == 1) {
2684 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2685 } elsif ($ev->{button} == 2) {
2686 $::CONN->send ("apply $item->{tag}");
2687 } elsif ($ev->{button} == 3) {
2688 CFClient::UI::Menu->new (
2689 items => [
2690 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2691 [
2692 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2693 sub { $::CONN->send ("lock $item->{tag}") },
2694 ],
2695 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2696 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2697 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2698 ],
2699 )->popup ($ev);
2700 }
2701
2702 1
2703 },
2704 %args
2705 );
2706 $self->add(new CFClient::UI::Face
2707 can_events => 0,
2708 face => $item->{face},
2709 anim => $item->{anim},
2710 animspeed => $item->{animspeed});
2711 $self->add(new CFClient::UI::Label
2712 can_events => 0,
2713 text => $desc);
2714
2715 $self
2716}
2717
2718#############################################################################
2719
2720package CFClient::UI::Inventory;
2721
2722our @ISA = CFClient::UI::ScrolledWindow::;
2723
2724sub new {
2725 my $class = shift;
2726
2727 my $self = $class->SUPER::new (
2728 scrolled => (new CFClient::UI::VBox),
2729 @_,
2730 );
2731
2732 $self
2733}
2734
2735sub set_items {
2736 my ($self, $items) = @_;
2737
2738 $self->{scrolled}->clear;
2739 return unless $items;
2740
2741 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2742
2743 $self->{real_items} = \@items;
2744
2745 for my $item (@items) {
2746 my $desc = $item->{nrof} < 2
2747 ? $item->{name}
2748 : "$item->{nrof} $item->{name_pl}";
2749
2750 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760
2761#############################################################################
2762
2763package CFClient::UI; 3571package CFClient::UI;
2764 3572
2765$ROOT = new CFClient::UI::Root; 3573$ROOT = new CFClient::UI::Root;
2766$TOOLTIP = new CFClient::UI::Tooltip; 3574$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2767 3575
27681 35761
2769 3577

Diff Legend

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