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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC

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

Diff Legend

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