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

Diff Legend

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