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

Diff Legend

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