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

Diff Legend

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