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.48 by root, Sun Apr 9 22:26:09 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 19:31:18 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
7
8use CFClient;
9
10our ($FOCUS, $HOVER, $GRAB); # various widgets
11
12our $TOPLEVEL;
13our $BUTTON_STATE;
14
15# class methods for events
16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS;
18}
19
20sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS;
22}
23
24sub feed_sdl_button_down_event {
25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27
28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y);
30
31 $GRAB = $widget;
32 $GRAB->update if $GRAB;
33 }
34
35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
38}
39
40sub feed_sdl_button_up_event {
41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49
50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab;
53 $GRAB->update if $GRAB;
54 }
55}
56
57sub feed_sdl_motion_event {
58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62
63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget;
65
66 $hover->update if $hover;
67 $HOVER->update if $HOVER;
68 }
69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
6 78
7use SDL::OpenGL; 79use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11
12# class methods for events
13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
15sub feed_sdl_button_down_event { }
16sub feed_sdl_button_up_event { }
17 80
18sub new { 81sub new {
19 my $class = shift; 82 my $class = shift;
20 83
21 bless { @_ }, $class 84 bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 @_
89 }, $class
22} 90}
23 91
24sub move { 92sub move {
25 my ($self, $x, $y, $z) = @_; 93 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 94 $self->{x} = $x;
… …
42 110
43 $self->{w} = $w; 111 $self->{w} = $w;
44 $self->{h} = $h; 112 $self->{h} = $h;
45} 113}
46 114
115# translate global koordinates to local coordinate system
116sub translate {
117 my ($self, $x, $y) = @_;
118
119 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
120}
121
47sub focus_in { 122sub focus_in {
48 my ($widget) = @_; 123 my ($self) = @_;
49 $::FOCUS = $widget; 124
125 return if $FOCUS == $self;
126
127 my $focus = $FOCUS; $FOCUS = $self;
128 $focus->update if $focus;
129 $FOCUS->update;
50} 130}
51 131
52sub focus_out { 132sub focus_out {
53 my ($widget) = @_; 133 my ($self) = @_;
54}
55 134
135 return unless $FOCUS == $self;
136
137 my $focus = $FOCUS; undef $FOCUS;
138 $focus->update if $focus; #?
139}
140
141sub mouse_motion { }
142sub button_up { }
56sub key_down { 143sub key_down { }
57 my ($widget, $sdlev) = @_;
58}
59
60sub key_up { 144sub key_up { }
61 my ($widget, $sdlev) = @_;
62}
63 145
64sub button_down { 146sub button_down {
65 my ($widget, $sdlev) = @_; 147 my ($self, $ev, $x, $y) = @_;
66}
67 148
68sub button_up { 149 $self->focus_in;
69 my ($widget, $sdlev) = @_;
70} 150}
71 151
72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 152sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 153sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 154sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 155sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 156sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77 157
78sub draw { 158sub draw {
79 my ($self) = @_; 159 my ($self) = @_;
160
161 return unless $self->{h} && $self->{w};
80 162
81 glPushMatrix; 163 glPushMatrix;
82 glTranslate $self->{x}, $self->{y}, 0; 164 glTranslate $self->{x}, $self->{y}, 0;
83 $self->_draw; 165 $self->_draw;
166 glPopMatrix;
167
84 if ($self == $::HOVER) { 168 if ($self == $HOVER) {
169 my ($x, $y) = @$self{qw(x y)};
170
85 glColor 1, 1, 1, 0.4; 171 glColor 1, 1, 1, 0.1;
86 glEnable GL_BLEND; 172 glEnable GL_BLEND;
173 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
87 glBegin GL_QUADS; 174 glBegin GL_QUADS;
88 glVertex 0, 0; 175 glVertex $x , $y;
89 glVertex $self->{w} - 1, 0; 176 glVertex $x + $self->{w}, $y;
90 glVertex $self->{w} - 1, $self->{h} - 1; 177 glVertex $x + $self->{w}, $y + $self->{h};
91 glVertex 0, $self->{h} - 1; 178 glVertex $x , $y + $self->{h};
92 glEnd; 179 glEnd;
93 glDisable GL_BLEND; 180 glDisable GL_BLEND;
94 } 181 }
95 glPopMatrix;
96} 182}
97 183
98sub _draw { 184sub _draw {
99 my ($self) = @_; 185 my ($self) = @_;
100 186
… …
140 226
141 $self->{parent}->update 227 $self->{parent}->update
142 if $self->{parent}; 228 if $self->{parent};
143} 229}
144 230
231sub connect {
232 my ($self, $signal, $cb) = @_;
233
234 push @{ $self->{cb}{$signal} }, $cb;
235}
236
237sub emit {
238 my ($self, $signal, @args) = @_;
239
240 $_->($self, @args)
241 for @{$self->{cb}{$signal} || []};
242}
243
145sub DESTROY { 244sub DESTROY {
146 my ($self) = @_; 245 my ($self) = @_;
147 246
148 #$self->deactivate; 247 #$self->deactivate;
149} 248}
150 249
151############################################################################# 250#############################################################################
152 251
153package Crossfire::Client::Widget::Container; 252package CFClient::UI::DrawBG;
154 253
155our @ISA = Crossfire::Client::Widget::; 254our @ISA = CFClient::UI::Base::;
255
256use strict;
257use SDL::OpenGL;
156 258
157sub new { 259sub new {
260 my $class = shift;
261
262 # range [value, low, high, page]
263
264 $class->SUPER::new (
265 bg => [0, 0, 0, 0.4],
266 active_bg => [1, 1, 1],
267 @_
268 )
269}
270
271sub _draw {
272 my ($self) = @_;
273
274 my ($w, $h) = @$self{qw(w h)};
275
276 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
277 glBegin GL_QUADS;
278 glVertex 0 , 0;
279 glVertex 0 , $h;
280 glVertex $w, $h;
281 glVertex $w, 0;
282 glEnd;
283}
284
285#############################################################################
286
287package CFClient::UI::Empty;
288
289our @ISA = CFClient::UI::Base::;
290
291sub size_request {
292 (0, 0)
293}
294
295sub draw { }
296
297#############################################################################
298
299package CFClient::UI::Container;
300
301our @ISA = CFClient::UI::Base::;
302
303sub new {
158 my ($class, @widgets) = @_; 304 my ($class, %arg) = @_;
159 305
306 my $children = delete $arg{children} || [];
307
160 my $self = $class->SUPER::new (children => []); 308 my $self = $class->SUPER::new (children => [], %arg);
161 $self->add ($_) for @widgets; 309 $self->add ($_) for @$children;
162 310
163 $self 311 $self
164} 312}
165 313
166sub add { 314sub add {
167 my ($self, $chld, $expand) = @_; 315 my ($self, $chld, $expand) = @_;
168 316
169 $chld->{expand} = $expand; 317 $chld->{expand} = $expand;
170 $chld->set_parent ($self); 318 $chld->set_parent ($self);
171 319
172 @{$self->{children}} = 320 $self->{children} = [
173 sort { $a->{z} <=> $b->{z} } 321 sort { $a->{z} <=> $b->{z} }
174 @{$self->{children}}, $chld; 322 @{$self->{children}}, $chld
323 ];
175 324
176 $self->size_allocate ($self->{w}, $self->{h}) 325 $self->size_allocate ($self->{w}, $self->{h})
177 if $self->{w}; #TODO: check for "realised state" 326 if $self->{w}; #TODO: check for "realised state"
178} 327}
179 328
… …
207 $_->draw for @{$self->{children}}; 356 $_->draw for @{$self->{children}};
208} 357}
209 358
210############################################################################# 359#############################################################################
211 360
212package Crossfire::Client::Widget::Bin; 361package CFClient::UI::Bin;
213 362
214our @ISA = Crossfire::Client::Widget::Container::; 363our @ISA = CFClient::UI::Container::;
364
365sub new {
366 my ($class, %arg) = @_;
367
368 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
369
370 $class->SUPER::new (children => [$child], %arg)
371}
372
373sub add {
374 my ($self, $widget) = @_;
375
376 $self->{children} = [];
377
378 $self->SUPER::add ($widget);
379}
380
381sub remove {
382 my ($self, $widget) = @_;
383
384 $self->SUPER::remove ($widget);
385
386 $self->{children} = [new CFClient::UI::Empty]
387 unless @{$self->{children}};
388}
215 389
216sub child { $_[0]->{children}[0] } 390sub child { $_[0]->{children}[0] }
217 391
218sub size_request { 392sub size_request {
219 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 393 $_[0]{children}[0]->size_request
220} 394}
221 395
222sub size_allocate { 396sub size_allocate {
223 my ($self, $w, $h) = @_; 397 my ($self, $w, $h) = @_;
224 398
399 return unless $self->{w} != $w || $self->{h} != $h;
400
225 $self->SUPER::size_allocate ($w, $h); 401 $self->SUPER::size_allocate ($w, $h);
226 $self->{children}[0]->size_allocate ($w, $h) 402 $self->{children}[0]->size_allocate ($w, $h);
227 if $self->{children}[0]
228} 403}
229 404
230############################################################################# 405#############################################################################
231 406
232package Crossfire::Client::Widget::Toplevel; 407package CFClient::UI::Window;
233 408
234our @ISA = Crossfire::Client::Widget::Container::; 409our @ISA = CFClient::UI::Bin::;
410
411use SDL::OpenGL;
412
413sub new {
414 my ($class, %arg) = @_;
415
416 my $self = $class->SUPER::new (%arg);
417}
235 418
236sub update { 419sub update {
237 my ($self) = @_; 420 my ($self) = @_;
238 421
239 ::refresh (); 422 # we want to do this delayed...
240}
241
242sub add {
243 my ($self, $widget) = @_;
244
245 $self->SUPER::add ($widget);
246
247 $widget->size_allocate ($widget->size_request);
248}
249
250#############################################################################
251
252package Crossfire::Client::Widget::Window;
253
254our @ISA = Crossfire::Client::Widget::Bin::;
255
256use SDL::OpenGL;
257
258sub new {
259 my ($class, $x, $y, $z, $w, $h) = @_;
260
261 my $self = $class->SUPER::new;
262
263 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
264}
265
266sub update {
267 my ($self) = @_;
268
269 $self->render_chld; 423 $self->render_chld;
270 $self->SUPER::update; 424 $self->SUPER::update;
271} 425}
272 426
273sub render_chld { 427sub render_chld {
274 my ($self) = @_; 428 my ($self) = @_;
275 429
276 $self->{texture} = 430 $self->{texture} =
277 Crossfire::Client::Texture->new_from_opengl ( 431 CFClient::Texture->new_from_opengl (
278 $self->{w}, $self->{h}, sub { $self->child->draw } 432 $self->{w}, $self->{h}, sub { $self->child->draw }
279 ); 433 );
280} 434}
281 435
282sub size_allocate { 436sub size_allocate {
283 my ($self, $w, $h) = @_; 437 my ($self, $w, $h) = @_;
284 438
439 return unless $self->{w} != $w || $self->{h} != $h;
440
285 $self->{w} = $w; 441 $self->{w} = $w;
286 $self->{h} = $h; 442 $self->{h} = $h;
287 443
288 $self->child->size_allocate ($w, $h); 444 $self->child->size_allocate ($w, $h);
289 445
… …
297 453
298 my $tex = $self->{texture} 454 my $tex = $self->{texture}
299 or return; 455 or return;
300 456
301 glEnable GL_BLEND; 457 glEnable GL_BLEND;
458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
302 glEnable GL_TEXTURE_2D; 459 glEnable GL_TEXTURE_2D;
303 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
304 glBindTexture GL_TEXTURE_2D, $tex->{name};
305 461
306 glBegin GL_QUADS; 462 $tex->draw_quad (0, 0, $w, $h);
307 glTexCoord 0, 0; glVertex 0, 0;
308 glTexCoord 0, 1; glVertex 0, $h;
309 glTexCoord 1, 1; glVertex $w, $h;
310 glTexCoord 1, 0; glVertex $w, 0;
311 glEnd;
312 463
313 glDisable GL_BLEND; 464 glDisable GL_BLEND;
314 glDisable GL_TEXTURE_2D; 465 glDisable GL_TEXTURE_2D;
315} 466}
316 467
317############################################################################# 468#############################################################################
318 469
319package Crossfire::Client::Widget::Frame; 470package CFClient::UI::Frame;
320 471
321our @ISA = Crossfire::Client::Widget::Bin::; 472our @ISA = CFClient::UI::Bin::;
322 473
323use SDL::OpenGL; 474use SDL::OpenGL;
324 475
325sub size_request { 476sub size_request {
326 my ($self) = @_; 477 my ($self) = @_;
… …
333} 484}
334 485
335sub size_allocate { 486sub size_allocate {
336 my ($self, $w, $h) = @_; 487 my ($self, $w, $h) = @_;
337 488
489 return unless $self->{w} != $w || $self->{h} != $h;
490
338 $self->{w} = $w; 491 $self->{w} = $w;
339 $self->{h} = $h; 492 $self->{h} = $h;
340 493
341 $self->child->size_allocate ($w - 4, $h - 4); 494 $self->child->size_allocate ($w - 4, $h - 4);
342 $self->child->move (2, 2); 495 $self->child->move (2, 2);
… …
349 502
350 my ($w, $h) = $chld->size_request; 503 my ($w, $h) = $chld->size_request;
351 504
352 glBegin GL_QUADS; 505 glBegin GL_QUADS;
353 glColor 0, 0, 0; 506 glColor 0, 0, 0;
354 glTexCoord 0, 0; glVertex 0 , 0; 507 glVertex 0 , 0;
355 glTexCoord 0, 1; glVertex 0 , $h + 4; 508 glVertex 0 , $h + 4;
356 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 509 glVertex $w + 4 , $h + 4;
357 glTexCoord 1, 0; glVertex $w + 4 , 0; 510 glVertex $w + 4 , 0;
358 glEnd; 511 glEnd;
359 512
360 $chld->draw; 513 $chld->draw;
361} 514}
362 515
363############################################################################# 516#############################################################################
364 517
365package Crossfire::Client::Widget::FancyFrame; 518package CFClient::UI::FancyFrame;
366 519
367our @ISA = Crossfire::Client::Widget::Bin::; 520our @ISA = CFClient::UI::Bin::;
368 521
369use SDL::OpenGL; 522use SDL::OpenGL;
370 523
371my @tex = 524my @tex =
372 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 525 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
373 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 526 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
374 527
375sub size_request { 528sub size_request {
376 my ($self) = @_; 529 my ($self) = @_;
377 530
378 my ($w, $h) = $self->SUPER::size_request; 531 my ($w, $h) = $self->SUPER::size_request;
379 532
380 $h += $tex[1]->{height}; 533 $h += $tex[1]->{h};
381 $h += $tex[4]->{height}; 534 $h += $tex[4]->{h};
382 $w += $tex[2]->{width}; 535 $w += $tex[2]->{w};
383 $w += $tex[3]->{width}; 536 $w += $tex[3]->{w};
384 537
385 ($w, $h) 538 ($w, $h)
386} 539}
387 540
388sub size_allocate { 541sub size_allocate {
389 my ($self, $w, $h) = @_; 542 my ($self, $w, $h) = @_;
390 543
544 return unless $self->{w} != $w || $self->{h} != $h;
545
391 $self->SUPER::size_allocate ($w, $h); 546 $self->SUPER::size_allocate ($w, $h);
392 547
393 $h -= $tex[1]->{height}; 548 $h -= $tex[1]->{h};
394 $h -= $tex[4]->{height}; 549 $h -= $tex[4]->{h};
395 $w -= $tex[2]->{width}; 550 $w -= $tex[2]->{w};
396 $w -= $tex[3]->{width}; 551 $w -= $tex[3]->{w};
397 552
398 $h = $h < 0 ? 0 : $h; 553 $h = $h < 0 ? 0 : $h;
399 $w = $w < 0 ? 0 : $w; 554 $w = $w < 0 ? 0 : $w;
400 555
556 my $child = $self->child;
557
401 $self->child->size_allocate ($w, $h); 558 $child->size_allocate ($w, $h);
402 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 559 $child->move ($tex[3]->{w}, $tex[1]->{h});
403} 560}
404 561
405sub _draw { 562sub _draw {
406 my ($self) = @_; 563 my ($self) = @_;
407 564
408 my ($w, $h) = ($self->{w}, $self->{h}); 565 my ($w, $h) = ($self->{w}, $self->{h});
409 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 566 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
410 567
411 glEnable GL_BLEND; 568 glEnable GL_BLEND;
569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
412 glEnable GL_TEXTURE_2D; 570 glEnable GL_TEXTURE_2D;
413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415 572
416 my $top = $tex[1]; 573 my $top = $tex[1];
417 glBindTexture GL_TEXTURE_2D, $top->{name}; 574 $top->draw_quad (0, 0, $w, $top->{h});
418
419 glBegin GL_QUADS;
420 glTexCoord 0, 0; glVertex 0 , 0;
421 glTexCoord 0, 1; glVertex 0 , $top->{height};
422 glTexCoord 1, 1; glVertex $w , $top->{height};
423 glTexCoord 1, 0; glVertex $w , 0;
424 glEnd;
425 575
426 my $left = $tex[3]; 576 my $left = $tex[3];
427 glBindTexture GL_TEXTURE_2D, $left->{name}; 577 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
428
429 glBegin GL_QUADS;
430 glTexCoord 0, 0; glVertex 0 , $top->{height};
431 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
432 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
433 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
434 glEnd;
435 578
436 my $right = $tex[2]; 579 my $right = $tex[2];
437 glBindTexture GL_TEXTURE_2D, $right->{name}; 580 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
438
439 glBegin GL_QUADS;
440 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
441 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
442 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
443 glTexCoord 1, 0; glVertex $w , $top->{height};
444 glEnd;
445 581
446 my $bottom = $tex[4]; 582 my $bottom = $tex[4];
447 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 583 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
448
449 glBegin GL_QUADS;
450 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
451 glTexCoord 0, 1; glVertex 0 , $h;
452 glTexCoord 1, 1; glVertex $w , $h;
453 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
454 glEnd;
455 584
456 my $bg = $tex[0]; 585 my $bg = $tex[0];
457 glBindTexture GL_TEXTURE_2D, $bg->{name}; 586 glBindTexture GL_TEXTURE_2D, $bg->{name};
458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 588 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
460 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 589 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
461 590
462 my $rep_x = $cw / $bg->{width}; 591 my $rep_x = $cw / $bg->{w};
463 my $rep_y = $ch / $bg->{height}; 592 my $rep_y = $ch / $bg->{h};
464 593
465 glBegin GL_QUADS; 594 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
466 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
467 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
468 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
469 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
470 glEnd;
471 595
472 glDisable GL_BLEND; 596 glDisable GL_BLEND;
473 glDisable GL_TEXTURE_2D; 597 glDisable GL_TEXTURE_2D;
474 598
475 $self->child->draw; 599 $self->child->draw;
476 600
477} 601}
478 602
479############################################################################# 603#############################################################################
480 604
481package Crossfire::Client::Widget::Table; 605package CFClient::UI::Table;
482 606
483our @ISA = Crossfire::Client::Widget::Bin::; 607our @ISA = CFClient::UI::Base::;
484 608
485use SDL::OpenGL; 609use SDL::OpenGL;
486 610
487sub add { 611sub add {
488 my ($self, $x, $y, $chld) = @_; 612 my ($self, $x, $y, $chld) = @_;
… …
563 } 687 }
564} 688}
565 689
566############################################################################# 690#############################################################################
567 691
568package Crossfire::Client::Widget::VBox; 692package CFClient::UI::VBox;
569 693
570our @ISA = Crossfire::Client::Widget::Container::; 694our @ISA = CFClient::UI::Container::;
571 695
572use SDL::OpenGL; 696use SDL::OpenGL;
573 697
574sub size_request { 698sub size_request {
575 my ($self) = @_; 699 my ($self) = @_;
… …
583} 707}
584 708
585sub size_allocate { 709sub size_allocate {
586 my ($self, $w, $h) = @_; 710 my ($self, $w, $h) = @_;
587 711
712 return unless $self->{w} != $w || $self->{h} != $h;
713
588 $self->w ($w); 714 $self->{w} = $w;
589 $self->h ($h); 715 $self->{h} = $h;
590 716
591 my $exp; 717 return unless $self->{h};
592 my @oth; 718
593 # find expand widget 719 my $children = $self->{children};
594 for (@{$self->{children}}) { 720
595 if ($_->{expand}) { 721 my @h = map +($_->size_request)[1], @$children;
596 $exp = $_; 722
597 last; 723 my $req_h = List::Util::sum @h;
724
725 if ($req_h > $h) {
726 # ah well, not enough space
727 $_ = $h[$_] * $h / $req_h for @h;
728 } else {
729 my @exp = grep $_->{expand}, @$children;
730 @exp = @$children unless @exp;
731
732 my %exp = map +($_ => 1), @exp;
733
734 for (0 .. $#$children) {
735 my $child = $children->[$_];
736
737 my $alloc_h = $h[$_];
738 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
739 $h[$_] = $alloc_h;
598 } 740 }
599 push @oth, $_;
600 }
601
602 my ($ow, $oh);
603
604 # get sizes of other widgets
605 for (@oth) {
606 my ($w, $h) = $_->size_request;
607 $oh += $h;
608 if ($ow < $w) { $ow = $w }
609 } 741 }
610 742
611 my $y = 0; 743 my $y = 0;
612 for (@{$self->{children}}) { 744 for (0 .. $#$children) {
745 my $child = $children->[$_];
746 my $h = $h[$_];
613 $_->move (0, $y); 747 $child->move (0, $y);
614
615 if ($_ == $exp) {
616 $_->size_allocate ($w, $h - $oh);
617 $y += $h - $oh;
618 } else {
619 my ($cw, $h) = $_->size_request;
620 $_->size_allocate ($w, $h); 748 $child->size_allocate ($w, $h);
749
621 $y += $h; 750 $y += $h;
622 }
623 } 751 }
624} 752}
625 753
626############################################################################# 754#############################################################################
627 755
628package Crossfire::Client::Widget::Label; 756package CFClient::UI::Label;
629 757
630our @ISA = Crossfire::Client::Widget::; 758our @ISA = CFClient::UI::Base::;
631 759
632use SDL::OpenGL; 760use SDL::OpenGL;
633 761
634sub new { 762sub new {
635 my ($class, $x, $y, $z, $height, $text) = @_; 763 my ($class, %arg) = @_;
636 764
637 # TODO: color, and make height, xyz etc. optional 765 my $self = $class->SUPER::new (
638 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 766 fg => [1, 1, 1],
767 height => $::FONTSIZE,
768 text => "",
769 align => -1,
770 layout => new CFClient::Layout,
771 %arg
772 );
639 773
640 $self->set_text ($text); 774 $self->set_text ($self->{text});
641 775
642 $self 776 $self
777}
778
779sub escape_text {
780 local $_ = $_[1];
781
782 s/&/&amp;/g;
783 s/>/&gt;/g;
784 s/</&lt;/g;
785
786 $_[1]
643} 787}
644 788
645sub set_text { 789sub set_text {
646 my ($self, $text) = @_; 790 my ($self, $text) = @_;
647 791
648 $self->{text} = $text; 792 $self->{text} = $text;
649 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 793 $self->{layout}->set_markup ($text);
650 794
795 delete $self->{texture};
651 $self->update; 796 $self->update;
652} 797}
653 798
654sub get_text { 799sub get_text {
655 my ($self, $text) = @_; 800 my ($self, $text) = @_;
… …
658} 803}
659 804
660sub size_request { 805sub size_request {
661 my ($self) = @_; 806 my ($self) = @_;
662 807
663 ( 808 $self->{layout}->set_width;
809 $self->{layout}->set_height ($self->{height});
810 $self->{layout}->size
811# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack
812# (
664 $self->{texture}{width}, 813# $self->{texture}{w},
665 $self->{texture}{height}, 814# $self->{texture}{h},
666 ) 815# )
816# } else {
817# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
818#
819# ($w, $h)
820# }
821}
822
823sub size_allocate {
824 my ($self, $w, $h) = @_;
825
826 return unless $self->{w} != $w || $self->{h} != $h;
827
828 $self->SUPER::size_allocate ($w, $h);
829 delete $self->{texture};
830}
831
832sub update {
833 my ($self) = @_;
834
835 delete $self->{texture};
836 $self->SUPER::update;
667} 837}
668 838
669sub _draw { 839sub _draw {
670 my ($self) = @_; 840 my ($self) = @_;
671 841
672 my $tex = $self->{texture}; 842 my $tex = $self->{texture} ||= do {
843 $self->{layout}->set_width ($self->{w});
844 new_from_layout CFClient::Texture $self->{layout}
845 };
673 846
674 glEnable GL_BLEND; 847 glEnable GL_BLEND;
848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
675 glEnable GL_TEXTURE_2D; 849 glEnable GL_TEXTURE_2D;
676 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 850 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
678 glBindTexture GL_TEXTURE_2D, $tex->{name};
679 851
680 glColor 1, 0, 0, 1; # TODO color 852 glColor @{$self->{fg}};
681 853
682 glBegin GL_QUADS; 854 my $x =
683 glTexCoord 0, 0; glVertex 0 , 0; 855 $self->{align} < 0 ? 0
684 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 856 : $self->{align} > 0 ? $self->{w} - $tex->{w}
685 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 857 : ($self->{w} - $tex->{w}) * 0.5;
686 glTexCoord 1, 0; glVertex $tex->{width}, 0;
687 glEnd;
688 858
859 $tex->draw_quad ($x, 0);
860
861 glDisable GL_TEXTURE_2D;
689 glDisable GL_BLEND; 862 glDisable GL_BLEND;
690 glDisable GL_TEXTURE_2D; 863 glGetError and die;
691} 864}
692 865
693############################################################################# 866#############################################################################
694 867
695package Crossfire::Client::Widget::TextEntry; 868package CFClient::UI::Entry;
696 869
697our @ISA = Crossfire::Client::Widget::Label::; 870our @ISA = CFClient::UI::Label::;
698 871
699use SDL; 872use SDL;
700use SDL::OpenGL; 873use SDL::OpenGL;
701 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 fg => [1, 1, 1],
880 bg => [0, 0, 0, 0.4],
881 active_bg => [1, 1, 1],
882 active_fg => [0, 0, 0],
883 @_
884 )
885}
886
887sub _set_text {
888 my ($self, $text) = @_;
889
890 $self->{last_activity} = $::NOW;
891
892 $self->{text} = $text;
893 $self->{layout}->set_width ($self->{w});
894
895 $text =~ s/./*/g if $self->{hidden};
896
897
898 $self->{layout}->set_markup ($self->escape_text ($text));
899
900 $text = substr $text, 0, $self->{cursor};
901 utf8::encode $text;
902
903 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
904}
905
906sub size_request {
907 my ($self) = @_;
908
909 my ($w, $h) = $self->SUPER::size_request;
910
911 ($w + 1, $h) # add 1 for cursor
912}
913
914sub size_allocate {
915 my ($self, $w, $h) = @_;
916
917 return unless $self->{w} != $w || $self->{h} != $h;
918
919 $self->SUPER::size_allocate ($w, $h);
920
921 $self->_set_text ($self->{text});
922}
923
924sub set_text {
925 my ($self, $text) = @_;
926
927 $self->{cursor} = length $text;
928 $self->_set_text ($text);
929 $self->update;
930}
931
702sub key_down { 932sub key_down {
703 my ($self, $ev) = @_; 933 my ($self, $ev) = @_;
704 934
705 my $mod = $ev->key_mod; 935 my $mod = $ev->key_mod;
706 my $sym = $ev->key_sym; 936 my $sym = $ev->key_sym;
707 937
708 $ev->set_unicode (1);
709 my $uni = $ev->key_unicode; 938 my $uni = $ev->key_unicode;
710 939
711 my $text = $self->get_text; 940 my $text = $self->get_text;
712 941
713 if ($sym == SDLK_BACKSPACE) { 942 if ($sym == SDLK_BACKSPACE) {
714 substr $text, -1, 1, ''; 943 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
715 944 } elsif ($sym == SDLK_DELETE) {
945 substr $text, $self->{cursor}, 1, "";
946 } elsif ($sym == SDLK_LEFT) {
947 --$self->{cursor} if $self->{cursor};
948 } elsif ($sym == SDLK_RIGHT) {
949 ++$self->{cursor} if $self->{cursor} < length $self->{text};
716 } elsif ($uni) { 950 } elsif ($uni) {
717 $text .= chr $uni; 951 substr $text, $self->{cursor}++, 0, chr $uni;
718 } 952 }
953
719 $self->set_text ($text); 954 $self->_set_text ($text);
955 $self->update;
720} 956}
721 957
722############################################################################# 958sub focus_in {
959 my ($self) = @_;
723 960
961 $self->{last_activity} = $::NOW;
962
963 $self->SUPER::focus_in;
964}
965
966sub button_down {
967 my ($self, $ev, $x, $y) = @_;
968
969 $self->SUPER::button_down ($ev, $x, $y);
970
971 my $idx = $self->{layout}->xy_to_index ($x, $y);
972
973 # byte-index to char-index
974 my $text = $self->{layout};
975 utf8::encode $text;
976 $self->{cursor} = length substr $text, 0, $idx;
977
978 $self->_set_text ($self->{text});
979 $self->update;
980}
981
982sub mouse_motion {
983 my ($self, $ev, $x, $y) = @_;
984# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
985}
986
987sub _draw {
988 my ($self) = @_;
989
990 local $self->{fg} = $self->{fg};
991
992 if ($FOCUS == $self) {
993 glColor @{$self->{active_bg}};
994 $self->{fg} = $self->{active_fg};
995 } else {
996 glColor @{$self->{bg}};
997 }
998
999 glBegin GL_QUADS;
1000 glVertex 0 , 0;
1001 glVertex 0 , $self->{h};
1002 glVertex $self->{w}, $self->{h};
1003 glVertex $self->{w}, 0;
1004 glEnd;
1005
1006 $self->SUPER::_draw;
1007
1008 #TODO: force update every cursor change :(
1009 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1010 glColor @{$self->{fg}};
1011 glBegin GL_LINES;
1012 glVertex $self->{cur_x}, $self->{cur_y};
1013 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1014 glEnd;
1015 }
1016}
1017
1018#############################################################################
1019
1020package CFClient::UI::Slider;
1021
1022use strict;
1023
1024use SDL::OpenGL;
1025
1026our @ISA = CFClient::UI::DrawBG::;
1027
1028sub size_request {
1029 my ($self) = @_;
1030
1031 my $w = 50;
1032 my $h = 10;
1033
1034 $self->{vertical} ? ($h, $w) : ($w, $h)
1035}
1036
1037sub new {
1038 my $class = shift;
1039
1040 # range [value, low, high, page]
1041
1042 $class->SUPER::new (
1043 fg => [1, 1, 1],
1044 active_fg => [0, 0, 0],
1045 range => [0, 0, 100, 10],
1046 vertical => 1,
1047 @_
1048 )
1049}
1050
1051sub button_down {
1052 my ($self, $ev, $x, $y) = @_;
1053
1054 $self->SUPER::button_down ($ev, $x, $y);
1055 $self->mouse_motion ($ev, $x, $y);
1056}
1057
1058sub mouse_motion {
1059 my ($self, $ev, $x, $y) = @_;
1060
1061 if ($GRAB == $self) {
1062 my ($value, $lo, $hi, $page) = @{$self->{range}};
1063
1064 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1065
1066 $x = $x * ($hi - $lo) / $w + $lo;
1067 $x = $lo if $x < $lo;
1068 $x = $hi - $page if $x > $hi - $page;
1069 $self->{range}[0] = $x;
1070
1071 $self->emit (changed => $x);
1072 $self->update;
1073 }
1074}
1075
1076sub _draw {
1077 my ($self) = @_;
1078
1079 $self->SUPER::_draw ();
1080
1081 my ($w, $h) = @$self{qw(w h)};
1082
1083 if ($self->{vertical}) {
1084 # draw a vertical slider like a rotated horizontal slider
1085
1086 glRotate 90, 0, 0, 1;
1087 glTranslate 0, -$self->{w}, 0;
1088
1089 ($w, $h) = ($h, $w);
1090 }
1091
1092 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1093 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1094
1095 my ($value, $lo, $hi, $page) = @{$self->{range}};
1096
1097 $page = int $page * $w / ($hi - $lo);
1098 $value = int +($value - $lo) * $w / ($hi - $lo);
1099
1100 $w -= $page;
1101 $page &= ~1;
1102 glTranslate $page * 0.5, 0, 0;
1103
1104 glColor @$fg;
1105 glBegin GL_LINES;
1106 glVertex 0, 0; glVertex 0, $h;
1107 glVertex $w - 1, 0; glVertex $w - 1, $h;
1108 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1109 glEnd;
1110
1111 my $knob_a = $value - $page * 0.5;
1112 my $knob_b = $value + $page * 0.5;
1113
1114 glBegin GL_QUADS;
1115 glColor @$fg;
1116 glVertex $knob_a, 0;
1117 glVertex $knob_a, $h;
1118 glVertex $knob_b, $h;
1119 glVertex $knob_b, 0;
1120
1121 if ($knob_a < $knob_b - 2) {
1122 glColor @$bg;
1123 glVertex $knob_a + 1, 1;
1124 glVertex $knob_a + 1, $h - 1;
1125 glVertex $knob_b - 1, $h - 1;
1126 glVertex $knob_b - 1, 1;
1127 }
1128 glEnd;
1129}
1130
1131#############################################################################
1132
724package Crossfire::Client::Widget::MapWidget; 1133package CFClient::UI::MapWidget;
725 1134
726use strict; 1135use strict;
727 1136
728use List::Util qw(min max); 1137use List::Util qw(min max);
729 1138
730use SDL; 1139use SDL;
731use SDL::OpenGL; 1140use SDL::OpenGL;
732use SDL::OpenGL::Constants;
733 1141
734our @ISA = Crossfire::Client::Widget::; 1142our @ISA = CFClient::UI::Base::;
1143
1144sub new {
1145 my $class = shift;
1146
1147 $class->SUPER::new (
1148 z => -1,
1149 list => (glGenLists 1),
1150 @_
1151 )
1152}
735 1153
736sub key_down { 1154sub key_down {
737 print "MAPKEYDOWN\n"; 1155 print "MAPKEYDOWN\n";
738} 1156}
739 1157
740sub key_up { 1158sub key_up {
741} 1159}
742 1160
743sub size_request { 1161sub size_request {
744 1162 (
1163 1 + int $::WIDTH / 32,
1164 1 + int $::HEIGHT / 32,
1165 )
745} 1166}
746 1167
747sub size_allocate { 1168sub update {
1169 my ($self) = @_;
1170
1171 $self->{need_update} = 1;
1172 $self->SUPER::update;
748} 1173}
749 1174
750sub _draw { 1175sub _draw {
751 my ($self) = @_; 1176 my ($self) = @_;
752 1177
1178 if (delete $self->{need_update}) {
1179 glNewList $self->{list}, GL_COMPILE;
1180
753 my $mx = $::CONN->{mapx}; 1181 my $mx = $::CONN->{mapx};
754 my $my = $::CONN->{mapy}; 1182 my $my = $::CONN->{mapy};
755 1183
756 my $map = $::CONN->{map}; 1184 my $map = $::CONN->{map};
757 1185
758 my ($xofs, $yofs); 1186 my ($xofs, $yofs);
759 1187
760 my $sw = 1 + int $::WIDTH / 32; 1188 my $sw = 1 + int $::WIDTH / 32;
761 my $sh = 1 + int $::HEIGHT / 32; 1189 my $sh = 1 + int $::HEIGHT / 32;
762 1190
763 if ($::CONN->{mapw} > $sw) { 1191 if ($::CONN->{mapw} > $sw) {
764 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1192 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
765 } else { 1193 } else {
766 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1194 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
767 } 1195 }
768 1196
769 if ($::CONN->{maph} > $sh) { 1197 if ($::CONN->{maph} > $sh) {
770 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1198 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
771 } else { 1199 } else {
772 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1200 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
773 } 1201 }
774 1202
775 glEnable GL_TEXTURE_2D; 1203 glEnable GL_TEXTURE_2D;
776 glEnable GL_BLEND; 1204 glEnable GL_BLEND;
1205 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
778 1207
779 my $sw4 = ($sw + 3) & ~3; 1208 my $sw4 = ($sw + 3) & ~3;
780 my $lighting = "\x00" x ($sw4 * $sh); 1209 my $darkness = "\x00" x ($sw4 * $sh);
781 1210
782 for my $x (0 .. $sw - 1) { 1211 for my $x (0 .. $sw - 1) {
1212 my $row = $map->[$x + $xofs];
783 for my $y (0 .. $sh - 1) { 1213 for my $y (0 .. $sh - 1) {
784 1214
785 my $cell = $map->[$x + $xofs][$y + $yofs] 1215 my $cell = $row->[$y + $yofs]
786 or next; 1216 or next;
787 1217
788 my $darkness = $cell->[0] * (1 / 255); 1218 my $dark = $cell->[0];
789 if ($darkness < 0) { 1219 if ($dark < 0) {
790 $darkness = 0.15; 1220 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1221 } else {
1222 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
791 } 1223 }
792 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
793 1224
794 for my $num (grep $_, @$cell[1,2,3]) { 1225 for my $num (grep $_, @$cell[1,2,3]) {
795 my $tex = $::CONN->{face}[$num]{texture} || next; 1226 my $tex = $::CONN->{face}[$num]{texture} || next;
1227
1228 my ($w, $h) = @$tex{qw(w h)};
796 1229
797 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1230 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
798
799 my $w = $tex->{width};
800 my $h = $tex->{height};
801
802 my $px = ($x + 1) * 32 - $w;
803 my $py = ($y + 1) * 32 - $h;
804
805 glBegin GL_QUADS;
806 glTexCoord 0, 0; glVertex $px , $py;
807 glTexCoord 0, 1; glVertex $px , $py + $h;
808 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
809 glTexCoord 1, 0; glVertex $px + $w, $py;
810 glEnd; 1231 }
811 } 1232 }
812 } 1233 }
813 }
814 1234
815# if (1) { # higher quality darkness 1235# if (1) { # higher quality darkness
816# $lighting =~ s/(.)/$1$1$1/gs; 1236# $lighting =~ s/(.)/$1$1$1/gs;
817# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1237# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
818# 1238#
… …
820# 1240#
821# $lighting = $pb->get_pixels; 1241# $lighting = $pb->get_pixels;
822# $lighting =~ s/(.)../$1/gs; 1242# $lighting =~ s/(.)../$1/gs;
823# } 1243# }
824 1244
825 $lighting = new Crossfire::Client::Texture
826 width => $sw4,
827 height => $sh,
828 data => $lighting,
829 internalformat => GL_ALPHA4,
830 format => GL_ALPHA;
831
832 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
833 glColor 0, 0, 0, 0.75;
834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
835 glBindTexture GL_TEXTURE_2D, $lighting->{name};
836 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
837 glBegin GL_QUADS;
838 glTexCoord 0, 0; glVertex 0 , 0;
839 glTexCoord 0, 1; glVertex 0 , $sh * 32;
840 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
841 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
842 glEnd;
843 1246
1247 $darkness = new CFClient::Texture
1248 w => $sw4,
1249 h => $sh,
1250 data => $darkness,
1251 internalformat => GL_ALPHA,
1252 format => GL_ALPHA;
1253
1254 glColor 0.45, 0.45, 0.45, 1;
1255 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1256
844 glDisable GL_TEXTURE_2D; 1257 glDisable GL_TEXTURE_2D;
845 glDisable GL_BLEND; 1258 glDisable GL_BLEND;
1259
1260 glEndList;
1261 }
1262
1263 glCallList $self->{list};
846} 1264}
847 1265
848my %DIR = ( 1266my %DIR = (
849 SDLK_KP8, [1, "north"], 1267 SDLK_KP8, [1, "north"],
850 SDLK_KP9, [2, "northeast"], 1268 SDLK_KP9, [2, "northeast"],
… …
896 } 1314 }
897} 1315}
898 1316
899############################################################################# 1317#############################################################################
900 1318
901package Crossfire::Client::Widget::Animator; 1319package CFClient::UI::Animator;
902 1320
903use SDL::OpenGL; 1321use SDL::OpenGL;
904 1322
905our @ISA = Crossfire::Client::Widget::Bin::; 1323our @ISA = CFClient::UI::Bin::;
906 1324
907sub moveto { 1325sub moveto {
908 my ($self, $x, $y) = @_; 1326 my ($self, $x, $y) = @_;
909 1327
910 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1328 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
911 $self->{speed} = 0.2; 1329 $self->{speed} = 0.001;
912 $self->{time} = 1; 1330 $self->{time} = 1;
913 1331
914 ::animation_start $self; 1332 ::animation_start $self;
915} 1333}
916 1334
… …
931 1349
932sub _draw { 1350sub _draw {
933 my ($self) = @_; 1351 my ($self) = @_;
934 1352
935 glPushMatrix; 1353 glPushMatrix;
936 glRotate $self->{time} * 10000, 0, 1, 0; 1354 glRotate $self->{time} * 1000, 0, 1, 0;
937 $self->{children}[0]->draw; 1355 $self->{children}[0]->draw;
938 glPopMatrix; 1356 glPopMatrix;
939} 1357}
940 1358
9411; 1359#############################################################################
942 1360
1361package CFClient::UI::Toplevel;
1362
1363our @ISA = CFClient::UI::Container::;
1364
1365sub size_request {
1366 ($::WIDTH, $::HEIGHT)
1367}
1368
1369sub size_allocate {
1370 my ($self, $w, $h) = @_;
1371
1372 $self->SUPER::size_allocate ($w, $h);
1373
1374 $_->size_allocate ($_->size_request)
1375 for @{$self->{children}};
1376}
1377
1378sub translate {
1379 my ($self, $x, $y) = @_;
1380
1381 ($x, $y)
1382}
1383
1384sub update {
1385 my ($self) = @_;
1386
1387 $self->size_allocate ($self->size_request);
1388 ::refresh ();
1389}
1390
1391sub add {
1392 my ($self, $widget) = @_;
1393
1394 $self->SUPER::add ($widget);
1395
1396 $widget->size_allocate ($widget->size_request);
1397}
1398
1399sub draw {
1400 my ($self) = @_;
1401
1402 $self->_draw;
1403}
1404
1405#############################################################################
1406
1407package CFClient::UI;
1408
1409$TOPLEVEL = new CFClient::UI::Toplevel;
1410
14111
1412

Diff Legend

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