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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 2007 UTC

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

Diff Legend

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