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.192 by root, Tue May 9 22:49:32 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

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

Diff Legend

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