ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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