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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC

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

Diff Legend

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