ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 2007 UTC

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

Diff Legend

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