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

Diff Legend

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