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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 2007 UTC

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

Diff Legend

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