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.66 by root, Tue Apr 11 14:36:02 2006 UTC vs.
Revision 1.109 by root, Sat Apr 15 01:13:47 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64 62
65 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
67 65
68 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
69 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
74 80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { 84 my $self = bless {
79 x => 0, 85 x => 0,
80 y => 0, 86 y => 0,
81 z => 0, 87 z => 0,
88 w => -1,
89 h => -1,
82 @_ 90 @_
83 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
84} 100}
85 101
86sub move { 102sub move {
87 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
88 $self->{x} = $x; 104 $self->{x} = $x;
… …
97sub size_request { 113sub size_request {
98 require Carp; 114 require Carp;
99 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
100} 116}
101 117
102sub size_allocate { 118sub _size_allocate {
103 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
104 125
105 $self->{w} = $w; 126 $self->{w} = $w;
106 $self->{h} = $h; 127 $self->{h} = $h;
107}
108 128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
109# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
110sub translate { 139sub translate {
111 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
112 141
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114} 143}
115 144
116sub focus_in { 145sub focus_in {
117 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
118 150
119 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 152 $focus->update if $focus;
121 $FOCUS->update; 153 $FOCUS->update;
122} 154}
… …
130 $focus->update if $focus; #? 162 $focus->update if $focus; #?
131} 163}
132 164
133sub mouse_motion { } 165sub mouse_motion { }
134sub button_up { } 166sub button_up { }
135sub button_down { }
136sub key_down { } 167sub key_down { }
137sub key_up { } 168sub key_up { }
169
170sub button_down {
171 my ($self, $ev, $x, $y) = @_;
172
173 $self->focus_in;
174}
138 175
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 181
145sub draw { 182sub draw {
146 my ($self) = @_; 183 my ($self) = @_;
147 184
185 return unless $self->{h} && $self->{w};
186
148 glPushMatrix; 187 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 189 $self->_draw;
151 if ($self == $HOVER) { 190 glPopMatrix;
152 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
153 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 198 glBegin GL_QUADS;
155 glVertex 0 , 0; 199 glVertex $x , $y;
156 glVertex $self->{w}, 0; 200 glVertex $x + $self->{w}, $y;
157 glVertex $self->{w}, $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
158 glVertex 0 , $self->{h}; 202 glVertex $x , $y + $self->{h};
159 glEnd; 203 glEnd;
160 glDisable GL_BLEND; 204 glDisable GL_BLEND;
161 } 205 }
162 glPopMatrix;
163} 206}
164 207
165sub _draw { 208sub _draw {
166 my ($self) = @_; 209 my ($self) = @_;
167 210
168 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
169}
170
171sub bbox {
172 my ($self) = @_;
173 my ($w, $h) = $self->size_request;
174 (
175 $self->{x},
176 $self->{y},
177 $self->{x} = $w,
178 $self->{y} = $h
179 )
180} 212}
181 213
182sub find_widget { 214sub find_widget {
183 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
184 216
… …
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188 220
189 () 221 ()
190} 222}
191 223
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent { 224sub set_parent {
195 my ($self, $par) = @_; 225 my ($self, $par) = @_;
196 226
197 $self->{parent} = $par; 227 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
207 237
208 $self->{parent}->update 238 $self->{parent}->update
209 if $self->{parent}; 239 if $self->{parent};
210} 240}
211 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
212sub DESTROY { 255sub DESTROY {
213 my ($self) = @_; 256 my ($self) = @_;
214 257
215 #$self->deactivate; 258 #$self->deactivate;
216} 259}
217 260
218############################################################################# 261#############################################################################
219 262
263package CFClient::UI::DrawBG;
264
265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
269
270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
283 my ($self) = @_;
284
285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
299}
300
301#############################################################################
302
220package CFClient::Widget::Empty; 303package CFClient::UI::Empty;
221 304
222our @ISA = CFClient::Widget::; 305our @ISA = CFClient::UI::Base::;
223 306
224sub size_request { 307sub size_request {
225 (0, 0) 308 (0, 0)
226} 309}
227 310
228sub draw { 311sub draw { }
229}
230 312
231############################################################################# 313#############################################################################
232 314
233package CFClient::Widget::Container; 315package CFClient::UI::Container;
234 316
235our @ISA = CFClient::Widget::; 317our @ISA = CFClient::UI::Base::;
236 318
237sub new { 319sub new {
238 my ($class, %arg) = @_; 320 my ($class, %arg) = @_;
239 321
240 my $children = delete $arg{children} || []; 322 my $children = delete $arg{children} || [];
… …
244 326
245 $self 327 $self
246} 328}
247 329
248sub add { 330sub add {
249 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
250 332
251 $chld->{expand} = $expand;
252 $chld->set_parent ($self); 333 $chld->set_parent ($self);
253 334
254 $self->{children} = [ 335 $self->{children} = [
255 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
256 @{$self->{children}}, $chld 337 @{$self->{children}}, $chld
257 ]; 338 ];
258 339
259 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
260 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
261} 342}
262 343
263sub remove { 344sub remove {
264 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
265 346
266 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
267 348
268 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
269} 350}
270 351
271sub find_widget { 352sub find_widget {
272 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
273 354
… …
290 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
291} 372}
292 373
293############################################################################# 374#############################################################################
294 375
295package CFClient::Widget::Bin; 376package CFClient::UI::Bin;
296 377
297our @ISA = CFClient::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
298 379
299sub new { 380sub new {
300 my ($class, %arg) = @_; 381 my ($class, %arg) = @_;
301 382
302 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
303 384
304 $class->SUPER::new (children => [$child], %arg) 385 $class->SUPER::new (children => [$child], %arg)
305} 386}
306 387
307sub add { 388sub add {
… …
315sub remove { 396sub remove {
316 my ($self, $widget) = @_; 397 my ($self, $widget) = @_;
317 398
318 $self->SUPER::remove ($widget); 399 $self->SUPER::remove ($widget);
319 400
320 $self->{children} = [new CFClient::Widget::Empty] 401 $self->{children} = [new CFClient::UI::Empty]
321 unless @{$self->{children}}; 402 unless @{$self->{children}};
322} 403}
323 404
324sub child { $_[0]->{children}[0] } 405sub child { $_[0]->{children}[0] }
325 406
326sub size_request { 407sub size_request {
327 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 408 $_[0]{children}[0]->size_request
328} 409}
329 410
330sub size_allocate { 411sub size_allocate {
331 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
332 413
333 $self->SUPER::size_allocate ($w, $h); 414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
334 $self->{children}[0]->size_allocate ($w, $h) 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
335 if $self->{children}[0]
336} 417}
337 418
338############################################################################# 419#############################################################################
339 420
340package CFClient::Widget::Window; 421package CFClient::UI::Window;
341 422
342our @ISA = CFClient::Widget::Bin::; 423our @ISA = CFClient::UI::Bin::;
343 424
344use SDL::OpenGL; 425use SDL::OpenGL;
345 426
346sub new { 427sub new {
347 my ($class, %arg) = @_; 428 my ($class, %arg) = @_;
… …
358} 439}
359 440
360sub render_chld { 441sub render_chld {
361 my ($self) = @_; 442 my ($self) = @_;
362 443
363 $self->{texture} = 444 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
364 CFClient::Texture->new_from_opengl ( 445 glClearColor 0, 0, 0, 1;
365 $self->{w}, $self->{h}, sub { $self->child->draw } 446 glClear GL_COLOR_BUFFER_BIT;
366 ); 447 $self->child->draw;
448 };
367} 449}
368 450
369sub size_allocate { 451sub size_allocate {
370 my ($self, $w, $h) = @_; 452 my ($self, $x, $y, $w, $h) = @_;
371 453
372 $self->{w} = $w; 454 $self->_size_allocate ($x, $y, $w, $h) or return;
373 $self->{h} = $h;
374 455
375 $self->child->size_allocate ($w, $h); 456 $self->child->size_allocate (0, 0, $w, $h);
376 457
377 $self->render_chld; 458 $self->render_chld;
378} 459}
379 460
380sub _draw { 461sub _draw {
… …
384 465
385 my $tex = $self->{texture} 466 my $tex = $self->{texture}
386 or return; 467 or return;
387 468
388 glEnable GL_BLEND; 469 glEnable GL_BLEND;
470 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
389 glEnable GL_TEXTURE_2D; 471 glEnable GL_TEXTURE_2D;
390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
391 473
392 $tex->draw_quad (0, 0, $w, $h); 474 $tex->draw_quad (0, 0, $w, $h);
393 475
… …
395 glDisable GL_TEXTURE_2D; 477 glDisable GL_TEXTURE_2D;
396} 478}
397 479
398############################################################################# 480#############################################################################
399 481
400package CFClient::Widget::Frame; 482package CFClient::UI::Frame;
401 483
402our @ISA = CFClient::Widget::Bin::; 484our @ISA = CFClient::UI::Bin::;
403 485
404use SDL::OpenGL; 486use SDL::OpenGL;
405 487
406sub size_request { 488sub size_request {
407 my ($self) = @_; 489 my ($self) = @_;
… …
412 494
413 map { $_ + 4 } $chld->size_request; 495 map { $_ + 4 } $chld->size_request;
414} 496}
415 497
416sub size_allocate { 498sub size_allocate {
417 my ($self, $w, $h) = @_; 499 my ($self, $x, $y, $w, $h) = @_;
418 500
419 $self->{w} = $w; 501 $self->_size_allocate ($x, $y, $w, $h) or return;
420 $self->{h} = $h;
421 502
422 $self->child->size_allocate ($w - 4, $h - 4); 503 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
423 $self->child->move (2, 2);
424} 504}
425 505
426sub _draw { 506sub _draw {
427 my ($self) = @_; 507 my ($self) = @_;
428 508
… …
441 $chld->draw; 521 $chld->draw;
442} 522}
443 523
444############################################################################# 524#############################################################################
445 525
446package CFClient::Widget::FancyFrame; 526package CFClient::UI::FancyFrame;
447 527
448our @ISA = CFClient::Widget::Bin::; 528our @ISA = CFClient::UI::Bin::;
449 529
450use SDL::OpenGL; 530use SDL::OpenGL;
451 531
452my @tex = 532my @tex =
453 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
454 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 534 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
455 535
536sub new {
537 my $class = shift;
538
539 # TODO: user_x, user_y, overwrite moveto?
540
541 $class->SUPER::new (
542 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8,
545 @_
546 )
547}
548
456sub size_request { 549sub size_request {
457 my ($self) = @_; 550 my ($self) = @_;
458 551
552 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
553
459 my ($w, $h) = $self->SUPER::size_request; 554 my ($w, $h) = $self->SUPER::size_request;
460 555
461 $h += $tex[1]->{height}; 556 (
462 $h += $tex[4]->{height}; 557 $w + $self->{border} * 2,
463 $w += $tex[2]->{width}; 558 $h + $self->{border} * 2,
464 $w += $tex[3]->{width}; 559 )
465
466 ($w, $h)
467} 560}
468 561
469sub size_allocate { 562sub size_allocate {
470 my ($self, $w, $h) = @_; 563 my ($self, $x, $y, $w, $h) = @_;
471 564
472 $self->SUPER::size_allocate ($w, $h); 565 $self->_size_allocate ($x, $y, $w, $h) or return;
473 566
474 $h -= $tex[1]->{height}; 567 $h -= List::Util::max 0, $self->{border} * 2;
475 $h -= $tex[4]->{height}; 568 $w -= List::Util::max 0, $self->{border} * 2;
476 $w -= $tex[2]->{width};
477 $w -= $tex[3]->{width};
478 569
479 $h = $h < 0 ? 0 : $h; 570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
480 $w = $w < 0 ? 0 : $w; 571}
481 572
482 my $child = $self->child; 573sub button_down {
574 my ($self, $ev, $x, $y) = @_;
483 575
484 $child->size_allocate ($w, $h); 576 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
485 $child->move ($tex[3]->{width}, $tex[1]->{height}); 577 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
578
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
580 my ($bw, $bh) = ($self->{w}, $self->{h});
581
582 $self->{motion} = sub {
583 my ($ev, $x, $y) = @_;
584
585 ($x, $y) = ($ev->motion_x, $ev->motion_y);
586
587 $self->{user_w} = $bw + $x - $ox;
588 $self->{user_h} = $bh + $y - $oy;
589 $self->update;
590 };
591
592 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $self->{border}) {
594
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
596 my ($bx, $by) = ($self->{x}, $self->{y});
597
598 $self->{motion} = sub {
599 my ($ev, $x, $y) = @_;
600
601 ($x, $y) = ($ev->motion_x, $ev->motion_y);
602
603 $self->move ($bx + $x - $ox, $by + $y - $oy);
604 $self->update;
605 };
606 }
607}
608
609sub button_up {
610 my ($self, $ev, $x, $y) = @_;
611
612 delete $self->{motion};
613}
614
615sub mouse_motion {
616 my ($self, $ev, $x, $y) = @_;
617
618 $self->{motion}->($ev, $x, $y) if $self->{motion};
486} 619}
487 620
488sub _draw { 621sub _draw {
489 my ($self) = @_; 622 my ($self) = @_;
490 623
491 my ($w, $h) = ($self->{w}, $self->{h}); 624 my ($w, $h ) = ($self->{w}, $self->{h});
492 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
493 626
494 glEnable GL_BLEND; 627 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
495 glEnable GL_TEXTURE_2D; 629 glEnable GL_TEXTURE_2D;
496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
497 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
498 631
499 my $top = $tex[1]; 632 glColor @{ $self->{border_bg} };
500 $top->draw_quad (0, 0, $w, $top->{height}); 633 $tex[1]->draw_quad (0, 0, $w, $self->{border});
501 634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
502 my $left = $tex[3]; 635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
503 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
504
505 my $right = $tex[2];
506 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
507
508 my $bottom = $tex[4];
509 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
510 637
511 my $bg = $tex[0]; 638 my $bg = $tex[0];
512 glBindTexture GL_TEXTURE_2D, $bg->{name};
513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
515 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
516 639
640 # TODO: repeat texture not scale
517 my $rep_x = $cw / $bg->{width}; 641 my $rep_x = $cw / $bg->{w};
518 my $rep_y = $ch / $bg->{height}; 642 my $rep_y = $ch / $bg->{h};
519 643
644 glColor @{ $self->{bg} };
645
646 $bg->{s} = $rep_x;
647 $bg->{t} = $rep_y;
648 $bg->{wrap_mode} = 1;
520 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 649 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
521 650
651 glDisable GL_TEXTURE_2D;
522 glDisable GL_BLEND; 652 glDisable GL_BLEND;
523 glDisable GL_TEXTURE_2D;
524 653
525 $self->child->draw; 654 $self->child->draw;
526
527} 655}
528 656
529############################################################################# 657#############################################################################
530 658
531package CFClient::Widget::Table; 659package CFClient::UI::Table;
532 660
533our @ISA = CFClient::Widget::Bin::; 661our @ISA = CFClient::UI::Base::;
662
663use List::Util qw(max sum);
534 664
535use SDL::OpenGL; 665use SDL::OpenGL;
666
667sub new {
668 my $class = shift;
669
670 $class->SUPER::new (
671 col_expand => [],
672 @_
673 )
674}
536 675
537sub add { 676sub add {
538 my ($self, $x, $y, $chld) = @_; 677 my ($self, $x, $y, $chld) = @_;
539 my $old_chld = $self->{children}[$y][$x];
540 678
541 $self->{children}[$y][$x] = $chld; 679 $self->{children}[$y][$x] = $chld;
542 $chld->set_parent ($self); 680 $chld->set_parent ($self);
681
682 $self->{w} = $self->{h} = -1;
543 $self->update; 683 $self->update;
544} 684}
545 685
546sub max_row_height { 686sub get_wh {
547 my ($self, $row) = @_; 687 my ($self) = @_;
548 688
549 my $hs = 0; 689 my (@w, @h);
550 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 690
691 for my $y (0 .. $#{$self->{children}}) {
551 my $c = $self->{children}->[$row]->[$xi]; 692 my $row = $self->{children}[$y]
552 if ($c) { 693 or next;
694
695 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x]
697 or next;
553 my ($w, $h) = $c->size_request; 698 my ($w, $h) = $widget->size_request;
554 if ($hs < $h) { $hs = $h } 699
700 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h;
555 } 702 }
556 } 703 }
557 return $hs;
558}
559 704
560sub max_col_width { 705 (\@w, \@h)
706}
707
708sub size_request {
561 my ($self, $col) = @_; 709 my ($self) = @_;
562 710
711 my ($ws, $hs) = $self->get_wh;
712
713 (
714 (sum @$ws),
715 (sum @$hs),
716 )
717}
718
719sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723
724 my ($ws, $hs) = $self->get_wh;
725
726 my $req_w = sum @$ws;
727 my $req_h = sum @$hs;
728
729 # TODO: nicer code && do row_expand
730 my @col_expand = @{$self->{col_expand}};
731 @col_expand = (1) x @$ws unless @col_expand;
732 my $col_expand = (sum @col_expand) || 1;
733
734 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems
740
741 my $y;
742
743 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r]
745 or next;
746
563 my $ws = 0; 747 my $x = 0;
564 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 748 my $row_h = $hs->[$r];
565 my $c = ($self->{children}->[$yi] || [])->[$col]; 749
566 if ($c) { 750 for my $c (0 .. $#$row) {
567 my ($w, $h) = $c->size_request; 751 my $col_w = $ws->[$c];
568 if ($ws < $w) { $ws = $w } 752
753 if (my $widget = $row->[$c]) {
754 $widget->size_allocate ($x, $y, $col_w, $row_h);
755 }
756
757 $x += $col_w;
569 } 758 }
759
760 $y += $row_h;
570 } 761 }
571 return $ws; 762
572} 763}
764
765sub find_widget {
766 my ($self, $x, $y) = @_;
767
768 $x -= $self->{x};
769 $y -= $self->{y};
770
771 my $res;
772
773 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
774 $res = $_->find_widget ($x, $y)
775 and return $res;
776 }
777
778 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
779}
780
781sub _draw {
782 my ($self) = @_;
783
784 for (grep $_, @{$self->{children}}) {
785 $_->draw for grep $_, @$_;
786 }
787}
788
789#############################################################################
790
791package CFClient::UI::HBox;
792
793# TODO: wrap into common Box base class
794
795our @ISA = CFClient::UI::Container::;
573 796
574sub size_request { 797sub size_request {
575 my ($self) = @_; 798 my ($self) = @_;
576 799
800 my @alloc = map [$_->size_request], @{$self->{children}};
801
802 (
803 (List::Util::sum map $_->[0], @alloc),
804 (List::Util::max map $_->[1], @alloc),
805 )
806}
807
808sub size_allocate {
809 my ($self, $x, $y, $w, $h) = @_;
810
811 $self->_size_allocate ($x, $y, $w, $h);
812
577 my ($hs, $ws) = (0, 0); 813 ($h, $w) = ($w, $h);
578 814
579 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 815 my $children = $self->{children};
580 $hs += $self->max_row_height ($yi);
581 }
582 816
583 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 817 my @h = map +($_->size_request)[0], @$children;
584 my $wm = 0; 818
585 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 819 my $req_h = List::Util::sum @h;
586 $wm += $self->max_col_width ($xi) 820
821 if ($req_h > $h) {
822 # ah well, not enough space
823 $_ *= $h / $req_h for @h;
824 } else {
825 my $exp = List::Util::sum map $_->{expand}, @$children;
826 $exp ||= 1;
827
828 for (0 .. $#$children) {
829 my $child = $children->[$_];
830
831 my $alloc_h = $h[$_];
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h;
587 } 834 }
588 if ($ws < $wm) { $ws = $wm }
589 } 835 }
590
591 return ($ws, $hs);
592}
593
594sub _draw {
595 my ($self) = @_;
596 836
597 my $y = 0; 837 my $y = 0;
598 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 838 for (0 .. $#$children) {
599 my $x = 0; 839 my $child = $children->[$_];
840 my $h = int $h[$_];
841 $child->size_allocate ($y, 0, $h, $w);
600 842
601 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 843 $y += $h;
602
603 my $c = $self->{children}->[$yi]->[$xi];
604 if ($c) {
605 $c->move ($x, $y, 0); #TODO: Move to size_request
606 $c->draw if $c;
607 }
608
609 $x += $self->max_col_width ($xi);
610 }
611
612 $y += $self->max_row_height ($yi);
613 } 844 }
614} 845}
615 846
616############################################################################# 847#############################################################################
617 848
618package CFClient::Widget::VBox; 849package CFClient::UI::VBox;
619 850
851# TODO: wrap into common Box base class
852
620our @ISA = CFClient::Widget::Container::; 853our @ISA = CFClient::UI::Container::;
621
622use SDL::OpenGL;
623 854
624sub size_request { 855sub size_request {
625 my ($self) = @_; 856 my ($self) = @_;
626 857
627 my @alloc = map [$_->size_request], @{$self->{children}}; 858 my @alloc = map [$_->size_request], @{$self->{children}};
… …
631 (List::Util::sum map $_->[1], @alloc), 862 (List::Util::sum map $_->[1], @alloc),
632 ) 863 )
633} 864}
634 865
635sub size_allocate { 866sub size_allocate {
636 my ($self, $w, $h) = @_; 867 my ($self, $x, $y, $w, $h) = @_;
637 868
638 $self->w ($w); 869 $self->_size_allocate ($x, $y, $w, $h);
639 $self->h ($h);
640 870
641 my $exp; 871 my $children = $self->{children};
642 my @oth; 872
643 # find expand widget 873 my @h = map +($_->size_request)[1], @$children;
644 for (@{$self->{children}}) { 874
645 if ($_->{expand}) { 875 my $req_h = List::Util::sum @h;
876
877 if ($req_h > $h) {
878 # ah well, not enough space
879 $_ *= $h / $req_h for @h;
880 } else {
881 my $exp = List::Util::sum map $_->{expand}, @$children;
646 $exp = $_; 882 $exp ||= 1;
647 last; 883
884 for (0 .. $#$children) {
885 my $child = $children->[$_];
886
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
648 } 888 }
649 push @oth, $_;
650 }
651
652 my ($ow, $oh);
653
654 # get sizes of other widgets
655 for (@oth) {
656 my ($w, $h) = $_->size_request;
657 $oh += $h;
658 if ($ow < $w) { $ow = $w }
659 } 889 }
660 890
661 my $y = 0; 891 my $y = 0;
662 for (@{$self->{children}}) { 892 for (0 .. $#$children) {
663 $_->move (0, $y); 893 my $child = $children->[$_];
664 894 my $h = int $h[$_];
665 if ($_ == $exp) {
666 $_->size_allocate ($w, $h - $oh);
667 $y += $h - $oh;
668 } else {
669 my ($cw, $h) = $_->size_request;
670 $_->size_allocate ($w, $h); 895 $child->size_allocate (0, $y, $w, $h);
896
671 $y += $h; 897 $y += $h;
672 }
673 } 898 }
674} 899}
675 900
676############################################################################# 901#############################################################################
677 902
678package CFClient::Widget::Label; 903package CFClient::UI::Label;
679 904
680our @ISA = CFClient::Widget::; 905our @ISA = CFClient::UI::Base::;
681 906
682use SDL::OpenGL; 907use SDL::OpenGL;
683 908
684sub new { 909sub new {
685 my ($class, %arg) = @_; 910 my ($class, %arg) = @_;
686 911
687 # TODO: color, and make height, xyz etc. optional
688 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
689 color => [1, 1, 1], 913 fg => [1, 1, 1],
690 height => $::FONTSIZE, 914 fontsize => $::FONTSIZE,
691 text => "", 915 text => "",
916 align => -1,
917 padding => 2,
692 layout => new CFClient::Layout, 918 layout => new CFClient::Layout,
693 %arg 919 %arg
694 ); 920 );
695 921
696 $self->set_text ($self->{text}); 922 $self->set_text ($self->{text});
697 923
698 $self 924 $self
699} 925}
700 926
927sub escape_text {
928 local $_ = $_[1];
929
930 s/&/&amp;/g;
931 s/>/&gt;/g;
932 s/</&lt;/g;
933
934 $_[1]
935}
936
701sub set_text { 937sub set_text {
702 my ($self, $text) = @_; 938 my ($self, $text) = @_;
703 939
704 $self->{text} = $text; 940 $self->{text} = $text;
705 $self->{layout}->set_markup ($text); 941 $self->{layout}->set_markup ($text);
706 942
707 delete $self->{texture}; 943 delete $self->{texture};
944# $self->{w} = $self->{h} = -1;
945 $self->update;
708} 946}
709 947
710sub get_text { 948sub get_text {
711 my ($self, $text) = @_; 949 my ($self, $text) = @_;
712 950
… …
715 953
716sub size_request { 954sub size_request {
717 my ($self) = @_; 955 my ($self) = @_;
718 956
719 $self->{layout}->set_width; 957 $self->{layout}->set_width;
720 $self->{layout}->set_height ($self->{height}); 958 $self->{layout}->set_height ($self->{fontsize});
721 $self->{layout}->size 959 my ($w, $h) = $self->{layout}->size;
722# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 960
723# ( 961 (
724# $self->{texture}{width}, 962 $w + $self->{padding} * 2,
725# $self->{texture}{height}, 963 $h + $self->{padding} * 2,
726# ) 964 )
727# } else {
728# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
729#
730# ($w, $h)
731# }
732} 965}
733 966
734sub size_allocate { 967sub size_allocate {
735 my ($self, $w, $h) = @_; 968 my ($self, $x, $y, $w, $h) = @_;
736 969
737 $self->SUPER::size_allocate ($w, $h); 970 $self->_size_allocate ($x, $y, $w, $h) or return;
971
738 delete $self->{texture}; 972 delete $self->{texture};
973}
974
975sub update {
976 my ($self) = @_;
977
978 delete $self->{texture};
979 $self->SUPER::update;
739} 980}
740 981
741sub _draw { 982sub _draw {
742 my ($self) = @_; 983 my ($self) = @_;
743 984
744 my $tex = $self->{texture} ||= do { 985 my $tex = $self->{texture} ||= do {
745 $self->{layout}->set_width ($self->{w}); 986 $self->{layout}->set_width ($self->{w});
987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
746 new_from_layout CFClient::Texture $self->{layout}; 988 new_from_layout CFClient::Texture $self->{layout}
747 }; 989 };
990
991 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993 glEnable GL_TEXTURE_2D;
994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
995
996 glColor @{$self->{fg}};
997
998 my $x =
999 $self->{align} < 0 ? $self->{padding}
1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001 : ($self->{w} - $tex->{w}) * 0.5;
1002
1003 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1004
1005 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND;
1007}
1008
1009#############################################################################
1010
1011package CFClient::UI::Entry;
1012
1013our @ISA = CFClient::UI::Label::;
1014
1015use SDL;
1016use SDL::OpenGL;
1017
1018sub new {
1019 my $class = shift;
1020
1021 $class->SUPER::new (
1022 fg => [1, 1, 1],
1023 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0],
1026 can_hover => 1,
1027 can_focus => 1,
1028 @_
1029 )
1030}
1031
1032sub _set_text {
1033 my ($self, $text) = @_;
1034
1035 my $old_text = $self->{text};
1036
1037 $self->{last_activity} = $::NOW;
1038
1039 $self->{text} = $text;
1040 $self->{layout}->set_width ($self->{w});
1041 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1042
1043 $text =~ s/./*/g if $self->{hidden};
1044
1045 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1046
1047 $text = substr $text, 0, $self->{cursor};
1048 utf8::encode $text;
1049
1050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053 if $old_text ne $self->{text};
1054}
1055
1056sub size_request {
1057 my ($self) = @_;
1058
1059 my ($w, $h) = $self->SUPER::size_request;
1060
1061 ($w + 1, $h) # add 1 for cursor
1062}
1063
1064sub size_allocate {
1065 my ($self, $x, $y, $w, $h) = @_;
1066
1067 $self->SUPER::size_allocate ($x, $y, $w, $h);
1068
1069 $self->_set_text ($self->{text});
1070}
1071
1072sub set_text {
1073 my ($self, $text) = @_;
1074
1075 $self->{cursor} = length $text;
1076 $self->_set_text ($text);
1077 $self->update;
1078}
1079
1080sub key_down {
1081 my ($self, $ev) = @_;
1082
1083 my $mod = $ev->key_mod;
1084 my $sym = $ev->key_sym;
1085
1086 my $uni = $ev->key_unicode;
1087
1088 my $text = $self->get_text;
1089
1090 if ($sym == SDLK_BACKSPACE) {
1091 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1092 } elsif ($sym == SDLK_DELETE) {
1093 substr $text, $self->{cursor}, 1, "";
1094 } elsif ($sym == SDLK_LEFT) {
1095 --$self->{cursor} if $self->{cursor};
1096 } elsif ($sym == SDLK_RIGHT) {
1097 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1098 } elsif ($sym == SDLK_HOME) {
1099 $self->{cursor} = 0;
1100 } elsif ($sym == SDLK_END) {
1101 $self->{cursor} = length $text;
1102 } elsif ($sym == SDLK_ESCAPE) {
1103 $self->emit ('escape');
1104 } elsif ($uni) {
1105 substr $text, $self->{cursor}++, 0, chr $uni;
1106 }
1107
1108 $self->_set_text ($text);
1109 $self->update;
1110}
1111
1112sub focus_in {
1113 my ($self) = @_;
1114
1115 $self->{last_activity} = $::NOW;
1116
1117 $self->SUPER::focus_in;
1118}
1119
1120sub button_down {
1121 my ($self, $ev, $x, $y) = @_;
1122
1123 $self->SUPER::button_down ($ev, $x, $y);
1124
1125 my $idx = $self->{layout}->xy_to_index ($x, $y);
1126
1127 # byte-index to char-index
1128 my $text = $self->{text};
1129 utf8::encode $text;
1130 $self->{cursor} = length substr $text, 0, $idx;
1131
1132 $self->_set_text ($self->{text});
1133 $self->update;
1134}
1135
1136sub mouse_motion {
1137 my ($self, $ev, $x, $y) = @_;
1138# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1139}
1140
1141sub _draw {
1142 my ($self) = @_;
1143
1144 local $self->{fg} = $self->{fg};
1145
1146 if ($FOCUS == $self) {
1147 glColor @{$self->{active_bg}};
1148 $self->{fg} = $self->{active_fg};
1149 } else {
1150 glColor @{$self->{bg}};
1151 }
1152
1153 glEnable GL_BLEND;
1154 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1155 glBegin GL_QUADS;
1156 glVertex 0 , 0;
1157 glVertex 0 , $self->{h};
1158 glVertex $self->{w}, $self->{h};
1159 glVertex $self->{w}, 0;
1160 glEnd;
1161 glDisable GL_BLEND;
1162
1163 $self->SUPER::_draw;
1164
1165 #TODO: force update every cursor change :(
1166 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1167 glColor @{$self->{fg}};
1168 glBegin GL_LINES;
1169 glVertex $self->{cur_x}, $self->{cur_y};
1170 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1171 glEnd;
1172 }
1173}
1174
1175package CFClient::UI::LineEntry;
1176
1177our @ISA = CFClient::UI::Entry::;
1178
1179use SDL;
1180use SDL::OpenGL;
1181
1182sub key_down {
1183 my ($self, $ev) = @_;
1184
1185 my $sym = $ev->key_sym;
1186
1187 if ($sym == SDLK_RETURN) {
1188 $self->emit (activate => $self->get_text);
1189 $self->update;
1190
1191 } else {
1192 $self->SUPER::key_down ($ev);
1193 }
1194
1195}
1196
1197#############################################################################
1198
1199package CFClient::UI::Button;
1200
1201our @ISA = CFClient::UI::Label::;
1202
1203use SDL;
1204use SDL::OpenGL;
1205
1206my @tex =
1207 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1208 qw(b1_button_active.png);
1209
1210sub new {
1211 my $class = shift;
1212
1213 $class->SUPER::new (
1214 padding => 4,
1215 fg => [1, 1, 1],
1216 bg => [1, 1, 1, 0.2],
1217 active_fg => [1, 1, 0],
1218 can_hover => 1,
1219 @_
1220 )
1221}
1222
1223sub button_up {
1224 my ($self, $ev, $x, $y) = @_;
1225
1226 if ($x >= 0 && $x < $self->{w}
1227 && $y >= 0 && $y < $self->{h}) {
1228 $self->emit ("activate");
1229 }
1230}
1231
1232sub _draw {
1233 my ($self) = @_;
1234
1235 local $self->{fg} = $self->{fg};
1236 my $tex = $tex[0];
748 1237
749 glEnable GL_BLEND; 1238 glEnable GL_BLEND;
750 glEnable GL_TEXTURE_2D; 1239 glEnable GL_TEXTURE_2D;
751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241
1242 if ($GRAB == $self) {
1243 $self->{fg} = $self->{active_fg};
1244 }
1245
1246 glBindTexture GL_TEXTURE_2D, $tex->{name};
752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
753 1248
754 glColor @{$self->{color}}; 1249 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
755 1250
1251 glDisable GL_TEXTURE_2D;
1252 glDisable GL_BLEND;
1253
1254 $self->SUPER::_draw;
1255}
1256
1257#############################################################################
1258
1259package CFClient::UI::CheckBox;
1260
1261our @ISA = CFClient::UI::DrawBG::;
1262
1263my @tex =
1264 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1265 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1266
1267use SDL;
1268use SDL::OpenGL;
1269
1270sub new {
1271 my $class = shift;
1272
1273 $class->SUPER::new (
1274 padding => 2,
1275 fg => [1, 1, 1],
1276 active_fg => [1, 1, 0],
1277 state => 0,
1278 can_hover => 1,
1279 @_
1280 )
1281}
1282
1283sub size_request {
1284 my ($self) = @_;
1285
1286 ($self->{padding} * 2 + 6) x 2
1287}
1288
1289sub size_allocate {
1290 my ($self, $x, $y, $w, $h) = @_;
1291
1292 $self->_size_allocate ($x, $y, $w, $h);
1293}
1294
1295sub button_down {
1296 my ($self, $ev, $x, $y) = @_;
1297
1298 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1299 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1300 $self->{state} = !$self->{state};
1301 $self->emit (changed => $self->{state});
1302 }
1303}
1304
1305sub _draw {
1306 my ($self) = @_;
1307
1308 $self->SUPER::_draw;
1309
1310 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1311
1312 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1313
1314 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1315
1316 glEnable GL_BLEND;
1317 glEnable GL_TEXTURE_2D;
1318 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1319
1320 my $tex = $self->{state} ? $tex[1] : $tex[0];
1321
756 $tex->draw_quad (0, 0); 1322 $tex->draw_quad (0, 0, $s, $s);
1323
1324 glDisable GL_TEXTURE_2D;
1325 glDisable GL_BLEND;
1326}
1327
1328#############################################################################
1329
1330package CFClient::UI::Slider;
1331
1332use strict;
1333
1334use SDL::OpenGL;
1335
1336our @ISA = CFClient::UI::DrawBG::;
1337
1338my @tex =
1339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1340 qw(s1_slider.png s1_slider_bg.png);
1341
1342sub new {
1343 my $class = shift;
1344
1345 # range [value, low, high, page]
1346
1347 # TODO: 0-width page
1348 # TODO: req_w/h are wrong with vertical
1349 # TODO: calculations are off
1350 my $self = $class->SUPER::new (
1351 fg => [1, 1, 1],
1352 active_fg => [0, 0, 0],
1353 range => [0, 0, 100, 10],
1354 req_w => 40,
1355 req_h => 13,
1356 vertical => 0,
1357 can_hover => 1,
1358 inner_pad => 5,
1359 @_
1360 );
1361
1362 $self
1363}
1364
1365sub size_request {
1366 my ($self) = @_;
1367
1368 my $w = $self->{req_w};
1369 my $h = $self->{req_h};
1370
1371 $self->{vertical} ? ($h, $w) : ($w, $h)
1372}
1373
1374sub button_down {
1375 my ($self, $ev, $x, $y) = @_;
1376
1377 $self->SUPER::button_down ($ev, $x, $y);
1378 $self->mouse_motion ($ev, $x, $y);
1379}
1380
1381sub mouse_motion {
1382 my ($self, $ev, $x, $y) = @_;
1383
1384 if ($GRAB == $self) {
1385 my ($value, $lo, $hi, $page) = @{$self->{range}};
1386
1387 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1388
1389 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1390 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1391
1392 $x -= $inner_pad_px; # substract the padding
1393 $x = $x * ($hi - $lo) / $inner_w + $lo;
1394 $x = $lo if $x < $lo;
1395 $x = $hi - $page if $x > $hi - $page;
1396 $self->{range}[0] = $x;
1397
1398 $self->emit (changed => $x);
1399 $self->update;
1400 }
1401}
1402
1403# the inner_* stuff is for generating a padding for the slider handle,
1404# so that the handle doesn't leave the texture. This calculation isn't 100%
1405# correct propably, but it does the job for now
1406sub _calc_inner_pad_px {
1407 my ($self, $w) = @_;
1408 ($w / 100) * $self->{inner_pad} # % to pixels
1409}
1410
1411sub _draw {
1412 my ($self) = @_;
1413
1414 $self->SUPER::_draw ();
1415
1416 my ($w, $h) = @$self{qw(w h)};
1417
1418 if ($self->{vertical}) {
1419 # draw a vertical slider like a rotated horizontal slider
1420
1421 glRotate 90, 0, 0, 1;
1422 glTranslate 0, -$self->{w}, 0;
1423
1424 ($w, $h) = ($h, $w);
1425 }
1426
1427 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1428 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1429
1430 my ($value, $lo, $hi, $page) = @{$self->{range}};
1431
1432 $hi = $value + 1 if $lo == $hi;
1433
1434 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1435 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1436
1437 $page = int $page * $inner_w / ($hi - $lo);
1438 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1439
1440 $w -= $page;
1441 $page &= ~1;
1442 glTranslate $page * 0.5, 0, 0;
1443 $page ||= 2;
1444
1445 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1446 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1447
1448 glEnable GL_BLEND;
1449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1450 glEnable GL_TEXTURE_2D;
1451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1452
1453 # draw background
1454 $tex[1]->draw_quad (0, 0, $w, $h);
1455
1456 # draw handle
1457 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
757 1458
758 glDisable GL_BLEND; 1459 glDisable GL_BLEND;
759 glDisable GL_TEXTURE_2D; 1460 glDisable GL_TEXTURE_2D;
760} 1461}
761 1462
762############################################################################# 1463#############################################################################
763 1464
1465package CFClient::UI::TextView;
1466
1467our @ISA = CFClient::UI::HBox::;
1468
1469use SDL::OpenGL;
1470
1471sub new {
1472 my $class = shift;
1473
1474 my $self = $class->SUPER::new (
1475 req_w => $::WIDTH / 6,
1476 req_h => $::HEIGHT / 6,
1477 fontsize => $::FONTSIZE,
1478 @_,
1479
1480 layout => (new CFClient::Layout),
1481 par => [],
1482 height => 0,
1483 children => [
1484 (new CFClient::UI::Empty expand => 1),
1485 (new CFClient::UI::Slider vertical => 1),
1486 ],
1487 );
1488
1489 $self->{children}[1]->connect (changed => sub {
1490 $self->update;
1491 });
1492
1493 $self
1494}
1495
1496sub set_fontsize {
1497 my ($self, $fontsize) = @_;
1498
1499 $self->{fontsize} = $fontsize;
1500 $self->reflow;
1501}
1502
1503sub text_height {
1504 my ($self, $text) = @_;
1505
1506 my $layout = $self->{layout};
1507
1508 $layout->set_height ($self->{fontsize});
1509 $layout->set_width ($self->{w});
1510 $layout->set_text ($text);
1511
1512 ($layout->size)[1]
1513}
1514
1515sub reflow {
1516 my ($self) = @_;
1517
1518 $self->{need_reflow}++;
1519 $self->update;
1520}
1521
1522sub size_request {
1523 my ($self) = @_;
1524
1525 ($self->{req_w}, $self->{req_h})
1526}
1527
1528sub size_allocate {
1529 my ($self, $x, $y, $w, $h) = @_;
1530
1531 $self->SUPER::size_allocate ($x, $y, $w, $h);
1532
1533 $self->{layout}->set_height ($self->{fontsize});
1534 $self->{layout}->set_width ($self->{w});
1535
1536 $self->reflow;
1537}
1538
1539sub add_paragraph {
1540 my ($self, $color, $text) = @_;
1541
1542 #TODO: intelligently "reformat" paragraph
1543
1544 my $height = $self->text_height ($text);
1545
1546 $self->{height} += $height;
1547
1548 push @{$self->{par}}, [$height, $color, $text];
1549
1550 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1551 $self->{children}[1]->update;
1552}
1553
1554sub update {
1555 my ($self) = @_;
1556
1557 $self->SUPER::update;
1558
1559 return unless $self->{h} > 0;
1560
1561 delete $self->{texture};
1562
1563 $TOPLEVEL->on_refresh ($self, sub {
1564 if (delete $self->{need_reflow}) {
1565 my $height = 0;
1566
1567 $height += $_->[0] = $self->text_height ($_->[2])
1568 for @{$self->{par}};
1569
1570 $self->{height} = $height;
1571
1572 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1573
1574 delete $self->{texture};
1575 }
1576
1577 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1578 glClearColor 0, 0, 0, 1;
1579 glClear GL_COLOR_BUFFER_BIT;
1580
1581 glEnable GL_BLEND;
1582 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1583 glEnable GL_TEXTURE_2D;
1584 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1585
1586 my $top = int $self->{children}[1]{range}[0];
1587
1588 my $y0 = $top;
1589 my $y1 = $top + $self->{h};
1590
1591 my $y = 0;
1592
1593 my $layout = $self->{layout};
1594
1595 for my $par (@{$self->{par}}) {
1596 my $h = $par->[0];
1597
1598 if ($y0 < $y + $h && $y < $y1) {
1599 $layout->set_text ($par->[2]);
1600
1601 glColor @{ $par->[1] };
1602 my ($W, $H) = $layout->size;
1603 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1604 }
1605
1606 $y += $h;
1607 }
1608
1609 glDisable GL_TEXTURE_2D;
1610 glDisable GL_BLEND;
1611 };
1612 });
1613}
1614
1615sub _draw {
1616 my ($self) = @_;
1617
1618 if ($self->{texture}) {
1619 glEnable GL_TEXTURE_2D;
1620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1621 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1622 glDisable GL_TEXTURE_2D;
1623 }
1624
1625 $self->{children}[1]->draw;
1626
1627}
1628
1629#############################################################################
1630
764package CFClient::Widget::Entry; 1631package CFClient::UI::MapWidget;
765 1632
766our @ISA = CFClient::Widget::Label::; 1633use strict;
1634
1635use List::Util qw(min max);
767 1636
768use SDL; 1637use SDL;
769use SDL::OpenGL; 1638use SDL::OpenGL;
770 1639
1640our @ISA = CFClient::UI::Base::;
1641
1642sub new {
1643 my $class = shift;
1644
1645 $class->SUPER::new (
1646 z => -1,
1647 can_focus => 1,
1648 list => (glGenLists 1),
1649 @_
1650 )
1651}
1652
771sub key_down { 1653sub key_down {
772 my ($self, $ev) = @_; 1654 print "MAPKEYDOWN\n";
1655}
773 1656
774 my $mod = $ev->key_mod; 1657sub key_up {
775 my $sym = $ev->key_sym;
776
777 my $uni = $ev->key_unicode;
778
779 my $text = $self->get_text;
780
781 if ($sym == SDLK_BACKSPACE) {
782 substr $text, -1, 1, '';
783 } elsif ($uni) {
784 $text .= chr $uni;
785 }
786
787 $self->set_text ($text);
788} 1658}
789 1659
790sub button_down { 1660sub button_down {
791 my ($self, $ev) = @_; 1661 my ($self, $ev, $x, $y) = @_;
792 1662
793 $self->focus_in; 1663 $self->focus_in;
1664
1665 if ($ev->button == 2) {
1666 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1667 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1668
1669 $self->{motion} = sub {
1670 my ($ev, $x, $y) = @_;
1671
1672 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1673
1674 $::CFG->{map_shift_x} = $bw + $x - $ox;
1675 $::CFG->{map_shift_y} = $bh + $y - $oy;
1676
1677 $self->update;
1678 };
1679 }
1680}
1681
1682sub button_up {
1683 my ($self, $ev, $x, $y) = @_;
1684
1685 delete $self->{motion};
794} 1686}
795 1687
796sub mouse_motion { 1688sub mouse_motion {
797 my ($self, $ev, $x, $y) = @_; 1689 my ($self, $ev, $x, $y) = @_;
798 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
799}
800 1690
801sub _draw { 1691 $self->{motion}->($ev, $x, $y) if $self->{motion};
802 my ($self) = @_;
803
804 if ($FOCUS == $self) {
805 glColor 1, 1, 1;
806 } else {
807 glColor 0.7, 0.7, 0.7;
808 }
809
810 glBegin GL_QUADS;
811 glVertex 0 , 0;
812 glVertex 0 , $self->{h} - 1;
813 glVertex $self->{w} - 1, $self->{h} - 1;
814 glVertex $self->{w} - 1, 0;
815 glEnd;
816
817 $self->SUPER::_draw;
818}
819
820#############################################################################
821
822package CFClient::Widget::MapWidget;
823
824use strict;
825
826use List::Util qw(min max);
827
828use SDL;
829use SDL::OpenGL;
830use SDL::OpenGL::Constants;
831
832our @ISA = CFClient::Widget::;
833
834sub new {
835 my $class = shift;
836
837 $class->SUPER::new (
838 z => -1,
839 list => (glGenLists 1),
840 @_
841 )
842}
843
844sub key_down {
845 print "MAPKEYDOWN\n";
846}
847
848sub key_up {
849} 1692}
850 1693
851sub size_request { 1694sub size_request {
852 ( 1695 (
853 1 + int $::WIDTH / 32, 1696 1 + 32 * int $::WIDTH / 32,
854 1 + int $::HEIGHT / 32, 1697 1 + 32 * int $::HEIGHT / 32,
855 ) 1698 )
856} 1699}
857 1700
858sub update { 1701sub update {
859 my ($self) = @_; 1702 my ($self) = @_;
860 1703
861 $self->{need_update} = 1; 1704 $self->{need_update} = 1;
1705 $self->SUPER::update;
862} 1706}
863 1707
864sub _draw { 1708sub draw {
865 my ($self) = @_; 1709 my ($self) = @_;
866 1710
867 if (delete $self->{need_update}) { 1711 if (delete $self->{need_update}) {
868 glNewList $self->{list}, GL_COMPILE; 1712 glNewList $self->{list}, GL_COMPILE;
869 1713
870 my $mx = $::CONN->{mapx}; 1714 if ($::MAP) {
871 my $my = $::CONN->{mapy};
872
873 my $map = $::CONN->{map};
874
875 my ($xofs, $yofs);
876
877 my $sw = 1 + int $::WIDTH / 32; 1715 my $sw = int $::WIDTH / 32;
878 my $sh = 1 + int $::HEIGHT / 32; 1716 my $sh = int $::HEIGHT / 32;
879 1717
880 if ($::CONN->{mapw} > $sw) { 1718 my $sx = $::CFG->{map_shift_x};
881 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1719 my $sy = $::CFG->{map_shift_y};
882 } else { 1720
883 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1721 glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0;
1722
1723 my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1);
1724
1725 if ($::CFG->{fow_enable}) {
1726 if ($::CFG->{fow_smooth}) { # smooth fog of war
1727 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1728 glConvolutionFilter2D
1729 GL_CONVOLUTION_2D,
1730 GL_ALPHA,
1731 3, 3,
1732 GL_ALPHA, GL_FLOAT,
1733 pack "f*",
1734 0.1, 0.1, 0.1,
1735 0.1, 0.2, 0.1,
1736 0.1, 0.1, 0.1,
1737 ;
1738 glEnable GL_CONVOLUTION_2D;
1739 }
1740
1741 my $tex = new CFClient::Texture
1742 w => $w,
1743 h => $h,
1744 data => $data,
1745 internalformat => GL_ALPHA,
1746 format => GL_ALPHA;
1747
1748 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1749
1750 glEnable GL_BLEND;
1751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1752 glEnable GL_TEXTURE_2D;
1753 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1754
1755 glColor +($::CFG->{fow_intensity}) x 3, 1;
1756 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1757
1758 glDisable GL_TEXTURE_2D;
1759 glDisable GL_BLEND;
1760 }
1761
1762 # HACK BEGIN
1763 {
1764 my ($w, $h) = (250, 250);
1765
1766 glEnable GL_BLEND;
1767 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1768 glEnable GL_TEXTURE_2D;
1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1770
1771 CFClient::Texture->new (
1772 w => $w,
1773 h => $h,
1774 data => $::MAP->mapmap ($w, $h),
1775 type => GL_UNSIGNED_INT_8_8_8_8_REV
1776 )->draw_quad (100, 100);
1777
1778 glDisable GL_TEXTURE_2D;
1779 glDisable GL_BLEND;
1780 }
1781 # HACK END
884 } 1782 }
885 1783
886 if ($::CONN->{maph} > $sh) {
887 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
888 } else {
889 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
890 }
891
892 glEnable GL_TEXTURE_2D;
893 glEnable GL_BLEND;
894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
895
896 my $sw4 = ($sw + 3) & ~3;
897 my $darkness = "\x00" x ($sw4 * $sh);
898
899 for my $x (0 .. $sw - 1) {
900 my $row = $map->[$x + $xofs];
901 for my $y (0 .. $sh - 1) {
902
903 my $cell = $row->[$y + $yofs]
904 or next;
905
906 my $dark = $cell->[0];
907 if ($dark < 0) {
908 substr $darkness, $y * $sw4 + $x, 1, chr 224;
909 } else {
910 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
911 }
912
913 for my $num (grep $_, @$cell[1,2,3]) {
914 my $tex = $::CONN->{face}[$num]{texture} || next;
915
916 my $w = $tex->{width};
917 my $h = $tex->{height};
918
919 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
920 }
921 }
922 }
923
924# if (1) { # higher quality darkness
925# $lighting =~ s/(.)/$1$1$1/gs;
926# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
927#
928# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
929#
930# $lighting = $pb->get_pixels;
931# $lighting =~ s/(.)../$1/gs;
932# }
933
934 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
936
937 $darkness = new CFClient::Texture
938 width => $sw4,
939 height => $sh,
940 data => $darkness,
941 internalformat => GL_ALPHA,
942 format => GL_ALPHA;
943
944 glColor 0.45, 0.45, 0.45, 1;
945 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
946
947 glDisable GL_TEXTURE_2D;
948 glDisable GL_BLEND;
949
950 glEndList; 1784 glEndList;
951 } 1785 }
952 1786
1787 glPushMatrix;
953 glCallList $self->{list}; 1788 glCallList $self->{list};
1789 glPopMatrix;
1790
1791 if ($FOCUS != $self) {
1792 glColor 64/255, 64/255, 64/255;
1793 glLogicOp GL_AND;
1794 glEnable GL_COLOR_LOGIC_OP;
1795 glBegin GL_QUADS;
1796 glVertex 0, 0;
1797 glVertex 0, $::HEIGHT;
1798 glVertex $::WIDTH, $::HEIGHT;
1799 glVertex $::WIDTH, 0;
1800 glEnd;
1801 glDisable GL_COLOR_LOGIC_OP;
1802 }
954} 1803}
955 1804
956my %DIR = ( 1805my %DIR = (
957 SDLK_KP8, [1, "north"], 1806 SDLK_KP8, [1, "north"],
958 SDLK_KP9, [2, "northeast"], 1807 SDLK_KP9, [2, "northeast"],
… …
974 1823
975 my $mod = $ev->key_mod; 1824 my $mod = $ev->key_mod;
976 my $sym = $ev->key_sym; 1825 my $sym = $ev->key_sym;
977 1826
978 if ($sym == SDLK_KP5) { 1827 if ($sym == SDLK_KP5) {
979 $::CONN->send ("command stay fire"); 1828 $::CONN->user_send ("command stay fire");
1829 } elsif ($sym == SDLK_a) {
1830 $::CONN->user_send ("command apply");
1831 } elsif ($sym == SDLK_QUOTE) {
1832 $self->emit ('activate_console');
1833 } elsif ($sym == SDLK_SLASH) {
1834 $self->emit ('activate_console' => '/');
980 } elsif (exists $DIR{$sym}) { 1835 } elsif (exists $DIR{$sym}) {
981 if ($mod & KMOD_SHIFT) { 1836 if ($mod & KMOD_SHIFT) {
982 $self->{shft}++; 1837 $self->{shft}++;
983 $::CONN->send ("command fire $DIR{$sym}[0]"); 1838 $::CONN->user_send ("command fire $DIR{$sym}[0]");
984 } elsif ($mod & KMOD_CTRL) { 1839 } elsif ($mod & KMOD_CTRL) {
985 $self->{ctrl}++; 1840 $self->{ctrl}++;
986 $::CONN->send ("command run $DIR{$sym}[0]"); 1841 $::CONN->user_send ("command run $DIR{$sym}[0]");
987 } else { 1842 } else {
988 $::CONN->send ("command $DIR{$sym}[1]"); 1843 $::CONN->user_send ("command $DIR{$sym}[1]");
989 } 1844 }
990 } 1845 }
991} 1846}
992 1847
993sub key_up { 1848sub key_up {
… …
995 1850
996 my $mod = $ev->key_mod; 1851 my $mod = $ev->key_mod;
997 my $sym = $ev->key_sym; 1852 my $sym = $ev->key_sym;
998 1853
999 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1854 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1000 $::CONN->send ("command fire_stop"); 1855 $::CONN->user_send ("command fire_stop");
1001 } 1856 }
1002 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1857 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1003 $::CONN->send ("command run_stop"); 1858 $::CONN->user_send ("command run_stop");
1004 } 1859 }
1005} 1860}
1006 1861
1007############################################################################# 1862#############################################################################
1008 1863
1009package CFClient::Widget::Animator; 1864package CFClient::UI::Animator;
1010 1865
1011use SDL::OpenGL; 1866use SDL::OpenGL;
1012 1867
1013our @ISA = CFClient::Widget::Bin::; 1868our @ISA = CFClient::UI::Bin::;
1014 1869
1015sub moveto { 1870sub moveto {
1016 my ($self, $x, $y) = @_; 1871 my ($self, $x, $y) = @_;
1017 1872
1018 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1873 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1046 glPopMatrix; 1901 glPopMatrix;
1047} 1902}
1048 1903
1049############################################################################# 1904#############################################################################
1050 1905
1906package CFClient::UI::Flopper;
1907
1908our @ISA = CFClient::UI::Button::;
1909
1910sub new {
1911 my $class = shift;
1912
1913 my $self = $class->SUPER::new (
1914 state => 0,
1915 connect_activate => \&toggle_flopper,
1916 @_
1917 );
1918
1919 if ($self->{state}) {
1920 $self->{state} = 0;
1921 $self->toggle_flopper;
1922 }
1923
1924 $self
1925}
1926
1927sub toggle_flopper {
1928 my ($self) = @_;
1929
1930 # TODO: use animation
1931 if ($self->{state} = !$self->{state}) {
1932 $CFClient::UI::TOPLEVEL->add ($self->{other});
1933 $self->{other}->move (
1934 ($::WIDTH - $self->{other}{w}) * 0.5,
1935 ($::HEIGHT - $self->{other}{h}) * 0.5,
1936 );
1937 } else {
1938 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1939 }
1940}
1941
1942#############################################################################
1943
1051package CFClient::Widget::Toplevel; 1944package CFClient::UI::Toplevel;
1052 1945
1053our @ISA = CFClient::Widget::Container::; 1946our @ISA = CFClient::UI::Container::;
1947
1948use SDL::OpenGL;
1054 1949
1055sub size_request { 1950sub size_request {
1056 ($::WIDTH, $::HEIGHT) 1951 ($::WIDTH, $::HEIGHT)
1057} 1952}
1058 1953
1059sub size_allocate { 1954sub size_allocate {
1060 my ($self, $w, $h) = @_; 1955 my ($self, $x, $y, $w, $h) = @_;
1061 1956
1062 $self->SUPER::size_allocate ($w, $h); 1957 $self->_size_allocate ($x, $y, $w, $h);
1063 1958
1064 $_->size_allocate ($_->size_request) 1959 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1065 for @{$self->{children}}; 1960 for @{$self->{children}};
1066} 1961}
1067 1962
1068sub translate { 1963sub translate {
1069 my ($self, $x, $y) = @_; 1964 my ($self, $x, $y) = @_;
… …
1072} 1967}
1073 1968
1074sub update { 1969sub update {
1075 my ($self) = @_; 1970 my ($self) = @_;
1076 1971
1077 $self->size_allocate ($self->size_request); 1972 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1078 ::refresh (); 1973 ::refresh ();
1079} 1974}
1080 1975
1081sub add { 1976sub add {
1082 my ($self, $widget) = @_; 1977 my ($self, $widget) = @_;
1083 1978
1084 $self->SUPER::add ($widget); 1979 $self->SUPER::add ($widget);
1085 1980
1086 $widget->size_allocate ($widget->size_request); 1981 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1982}
1983
1984sub on_refresh {
1985 my ($self, $id, $cb) = @_;
1986
1987 $self->{refresh_hook}{$id} = $cb;
1087} 1988}
1088 1989
1089sub draw { 1990sub draw {
1090 my ($self) = @_; 1991 my ($self) = @_;
1091 1992
1993 while (my $rcb = delete $self->{refresh_hook}) {
1994 $_->() for values %$rcb;
1995 }
1996
1997 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1998 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1999 glClear GL_COLOR_BUFFER_BIT;
2000
2001 glMatrixMode GL_PROJECTION;
2002 glLoadIdentity;
2003 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2004 glMatrixMode GL_MODELVIEW;
2005 glLoadIdentity;
2006
1092 $self->_draw; 2007 $self->_draw;
1093} 2008}
1094 2009
1095############################################################################# 2010#############################################################################
1096 2011
1097package CFClient::Widget; 2012package CFClient::UI;
1098 2013
1099$TOPLEVEL = new CFClient::Widget::Toplevel; 2014$TOPLEVEL = new CFClient::UI::Toplevel;
1100 2015
11011 20161
1102 2017

Diff Legend

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