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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

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