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.200 by root, Sat May 13 00:27:09 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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