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

Diff Legend

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