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.175 by root, Tue Apr 25 11:48:31 2006 UTC vs.
Revision 1.410 by root, Sun Jul 22 16:37:19 2007 UTC

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

Diff Legend

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