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.39 by root, Sun Apr 9 21:39:08 2006 UTC vs.
Revision 1.67 by root, Tue Apr 11 14:36:59 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
11 16
12# class methods for events 17# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
15sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
16sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
17 74
18sub new { 75sub new {
19 my $class = shift; 76 my $class = shift;
20 77
21 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
22} 84}
23 85
24sub move { 86sub move {
25 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 88 $self->{x} = $x;
… …
37 Carp::confess "size_request is abtract"; 99 Carp::confess "size_request is abtract";
38} 100}
39 101
40sub size_allocate { 102sub size_allocate {
41 my ($self, $w, $h) = @_; 103 my ($self, $w, $h) = @_;
104
42 $self->w ($w); 105 $self->{w} = $w;
43 $self->h ($h); 106 $self->{h} = $h;
107}
108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
44} 114}
45 115
46sub focus_in { 116sub focus_in {
47 my ($widget) = @_; 117 my ($self) = @_;
48 $FOCUS = $widget; 118
119 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
49} 122}
50 123
51sub focus_out { 124sub focus_out {
52 my ($widget) = @_; 125 my ($self) = @_;
53}
54 126
55sub key_down { 127 return unless $FOCUS == $self;
56 my ($widget, $sdlev) = @_;
57}
58 128
59sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
60 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
61} 131}
62 132
133sub mouse_motion { }
134sub button_up { }
63sub button_down { 135sub button_down { }
64 my ($widget, $sdlev) = @_; 136sub key_down { }
65} 137sub key_up { }
66 138
67sub button_up {
68 my ($widget, $sdlev) = @_;
69}
70
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 144
77sub draw { 145sub draw {
78 my ($self) = @_; 146 my ($self) = @_;
79 147
80 glPushMatrix; 148 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
83 glPopMatrix; 162 glPopMatrix;
84} 163}
85 164
86sub _draw { 165sub _draw {
87 my ($self) = @_; 166 my ($self) = @_;
… …
136 #$self->deactivate; 215 #$self->deactivate;
137} 216}
138 217
139############################################################################# 218#############################################################################
140 219
220package CFClient::Widget::Empty;
221
222our @ISA = CFClient::Widget::;
223
224sub size_request {
225 (0, 0)
226}
227
228sub draw { }
229
230#############################################################################
231
141package Crossfire::Client::Widget::Container; 232package CFClient::Widget::Container;
142 233
143our @ISA = Crossfire::Client::Widget::; 234our @ISA = CFClient::Widget::;
144 235
145sub new { 236sub new {
146 my ($class, @widgets) = @_; 237 my ($class, %arg) = @_;
147 238
239 my $children = delete $arg{children} || [];
240
148 my $self = $class->SUPER::new (children => []); 241 my $self = $class->SUPER::new (children => [], %arg);
149 $self->add ($_) for @widgets; 242 $self->add ($_) for @$children;
150 243
151 $self 244 $self
152} 245}
153 246
154sub add { 247sub add {
155 my ($self, $chld, $expand) = @_; 248 my ($self, $chld, $expand) = @_;
156 249
157 $chld->{expand} = $expand; 250 $chld->{expand} = $expand;
158 $chld->set_parent ($self); 251 $chld->set_parent ($self);
159 252
160 @{$self->{children}} = 253 $self->{children} = [
161 sort { $a->{z} <=> $b->{z} } 254 sort { $a->{z} <=> $b->{z} }
162 @{$self->{children}}, $chld; 255 @{$self->{children}}, $chld
256 ];
163 257
164 $self->size_allocate ($self->{w}, $self->{h}); 258 $self->size_allocate ($self->{w}, $self->{h})
259 if $self->{w}; #TODO: check for "realised state"
165} 260}
166 261
167sub remove { 262sub remove {
168 my ($self, $widget) = @_; 263 my ($self, $widget) = @_;
169 264
… …
173} 268}
174 269
175sub find_widget { 270sub find_widget {
176 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
177 272
273 $x -= $self->{x};
274 $y -= $self->{y};
275
178 my $res; 276 my $res;
179 277
180 for (@{ $self->{children} }) { 278 for (reverse @{ $self->{children} }) {
181 $res = $_->find_widget ($x, $y) 279 $res = $_->find_widget ($x, $y)
182 and return $res; 280 and return $res;
183 } 281 }
184 282
185 () 283 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
186}
187
188sub size_request {
189 my ($self) = @_;
190
191 my ($hs, $ws) = (0, 0);
192 for (@{$self->{children} || []}) {
193 my ($w, $h) = $_->size_request;
194 $hs += $h;
195 if ($ws < $w) { $ws = $w }
196 }
197
198 return ($ws, $hs);
199} 284}
200 285
201sub _draw { 286sub _draw {
202 my ($self) = @_; 287 my ($self) = @_;
203 288
204 $_->draw for @{$self->{children}}; 289 $_->draw for @{$self->{children}};
205} 290}
206 291
207############################################################################# 292#############################################################################
208 293
209package Crossfire::Client::Widget::Bin; 294package CFClient::Widget::Bin;
210 295
211our @ISA = Crossfire::Client::Widget::Container::; 296our @ISA = CFClient::Widget::Container::;
297
298sub new {
299 my ($class, %arg) = @_;
300
301 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
302
303 $class->SUPER::new (children => [$child], %arg)
304}
305
306sub add {
307 my ($self, $widget) = @_;
308
309 $self->{children} = [];
310
311 $self->SUPER::add ($widget);
312}
313
314sub remove {
315 my ($self, $widget) = @_;
316
317 $self->SUPER::remove ($widget);
318
319 $self->{children} = [new CFClient::Widget::Empty]
320 unless @{$self->{children}};
321}
212 322
213sub child { $_[0]->{children}[0] } 323sub child { $_[0]->{children}[0] }
214 324
215sub size_request { 325sub size_request {
216 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 326 $_[0]{children}[0]->size_request if $_[0]{children}[0];
217} 327}
218 328
219sub size_allocate { 329sub size_allocate {
220 my ($self, $w, $h) = @_; 330 my ($self, $w, $h) = @_;
331
221 $self->SUPER::size_allocate ($w, $h); 332 $self->SUPER::size_allocate ($w, $h);
222 $self->{children}[0]->size_allocate ($w, $h) 333 $self->{children}[0]->size_allocate ($w, $h)
223 if $self->{children}[0] 334 if $self->{children}[0]
224} 335}
225 336
226############################################################################# 337#############################################################################
227 338
228package Crossfire::Client::Widget::Toplevel; 339package CFClient::Widget::Window;
229 340
230our @ISA = Crossfire::Client::Widget::Container::; 341our @ISA = CFClient::Widget::Bin::;
342
343use SDL::OpenGL;
344
345sub new {
346 my ($class, %arg) = @_;
347
348 my $self = $class->SUPER::new (%arg);
349}
231 350
232sub update { 351sub update {
233 my ($self) = @_; 352 my ($self) = @_;
234 353
235 ::refresh (); 354 # we want to do this delayed...
236}
237
238#############################################################################
239
240package Crossfire::Client::Widget::Window;
241
242our @ISA = Crossfire::Client::Widget::Bin::;
243
244use SDL::OpenGL;
245
246sub add {
247 my ($self, $chld) = @_;
248 warn "ADD $chld\n";
249 $self->SUPER::add ($chld);
250 $chld->set_parent ($self);
251}
252
253sub remove {
254 my ($self) = @_;
255 # TODO FIXME: removing a child from a window will crash, see render_chld
256 # $self->update;
257}
258
259sub update {
260 my ($self) = @_;
261 $self->render_chld; 355 $self->render_chld;
356 $self->SUPER::update;
262} 357}
263 358
264sub render_chld { 359sub render_chld {
265 my ($self) = @_; 360 my ($self) = @_;
266 my $chld = $self->get;
267 my ($w, $h) = $self->size_request;
268 361
269 require Carp;
270 Carp::cluck "RENDERCHI $w $h";
271 warn "RENDERCHI $w $h\n";
272 $self->{texture} = 362 $self->{texture} =
273 Crossfire::Client::Texture->new_from_opengl ( 363 CFClient::Texture->new_from_opengl (
274 $w, $h, sub { $chld->draw } 364 $self->{w}, $self->{h}, sub { $self->child->draw }
275 ); 365 );
276 $self->{texture}->upload;
277}
278
279sub size_request {
280 my ($self) = @_;
281 ($self->w, $self->h)
282} 366}
283 367
284sub size_allocate { 368sub size_allocate {
285 my ($self, $w, $h) = @_; 369 my ($self, $w, $h) = @_;
286 370
287 $self->w ($w); 371 $self->{w} = $w;
288 $self->h ($h); 372 $self->{h} = $h;
373
289 $self->get->size_allocate ($w, $h); 374 $self->child->size_allocate ($w, $h);
290 375
291 $self->update; #TODO: Move this to the size_request event propably? 376 $self->render_chld;
292} 377}
293 378
294sub _draw { 379sub _draw {
295 my ($self) = @_; 380 my ($self) = @_;
296 381
… …
300 or return; 385 or return;
301 386
302 glEnable GL_BLEND; 387 glEnable GL_BLEND;
303 glEnable GL_TEXTURE_2D; 388 glEnable GL_TEXTURE_2D;
304 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
305 glBindTexture GL_TEXTURE_2D, $tex->{name};
306 390
307 glBegin GL_QUADS; 391 $tex->draw_quad (0, 0, $w, $h);
308 glTexCoord 0, 0; glVertex 0, 0;
309 glTexCoord 0, 1; glVertex 0, $h;
310 glTexCoord 1, 1; glVertex $w, $h;
311 glTexCoord 1, 0; glVertex $w, 0;
312 glEnd;
313 392
314 glDisable GL_BLEND; 393 glDisable GL_BLEND;
315 glDisable GL_TEXTURE_2D; 394 glDisable GL_TEXTURE_2D;
316} 395}
317 396
318############################################################################# 397#############################################################################
319 398
320package Crossfire::Client::Widget::Frame; 399package CFClient::Widget::Frame;
321 400
322our @ISA = Crossfire::Client::Widget::Bin::; 401our @ISA = CFClient::Widget::Bin::;
323 402
324use SDL::OpenGL; 403use SDL::OpenGL;
325 404
326sub size_request { 405sub size_request {
327 my ($self) = @_; 406 my ($self) = @_;
… …
333 map { $_ + 4 } $chld->size_request; 412 map { $_ + 4 } $chld->size_request;
334} 413}
335 414
336sub size_allocate { 415sub size_allocate {
337 my ($self, $w, $h) = @_; 416 my ($self, $w, $h) = @_;
338 417
339 $self->w ($w); 418 $self->{w} = $w;
340 $self->h ($h); 419 $self->{h} = $h;
341 420
342 $self->child->size_allocate ($w - 4, $h - 4); 421 $self->child->size_allocate ($w - 4, $h - 4);
343 $self->child->move (2, 2); 422 $self->child->move (2, 2);
344} 423}
345 424
… …
350 429
351 my ($w, $h) = $chld->size_request; 430 my ($w, $h) = $chld->size_request;
352 431
353 glBegin GL_QUADS; 432 glBegin GL_QUADS;
354 glColor 0, 0, 0; 433 glColor 0, 0, 0;
355 glTexCoord 0, 0; glVertex 0 , 0; 434 glVertex 0 , 0;
356 glTexCoord 0, 1; glVertex 0 , $h + 4; 435 glVertex 0 , $h + 4;
357 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 436 glVertex $w + 4 , $h + 4;
358 glTexCoord 1, 0; glVertex $w + 4 , 0; 437 glVertex $w + 4 , 0;
359 glEnd; 438 glEnd;
360 439
361 $chld->draw; 440 $chld->draw;
362} 441}
363 442
364############################################################################# 443#############################################################################
365 444
366package Crossfire::Client::Widget::FancyFrame; 445package CFClient::Widget::FancyFrame;
367 446
368our @ISA = Crossfire::Client::Widget::Frame::; 447our @ISA = CFClient::Widget::Bin::;
369 448
370use SDL::OpenGL; 449use SDL::OpenGL;
371 450
372sub new { 451my @tex =
373 my ($self, $theme) = @_;
374 $self = $self->SUPER::new;
375
376 $self->{txts} = [
377 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 452 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
378 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 453 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
379 ];
380 $self
381}
382 454
383sub size_request { 455sub size_request {
384 my ($self) = @_; 456 my ($self) = @_;
385 457
386 my ($w, $h) = $self->SUPER::size_request; 458 my ($w, $h) = $self->SUPER::size_request;
387 459
388 $h += $self->{txts}->[1]->{height}; 460 $h += $tex[1]->{height};
389 $h += $self->{txts}->[4]->{height}; 461 $h += $tex[4]->{height};
390 $w += $self->{txts}->[2]->{width}; 462 $w += $tex[2]->{width};
391 $w += $self->{txts}->[3]->{width}; 463 $w += $tex[3]->{width};
392 464
393 ($w, $h) 465 ($w, $h)
394} 466}
395 467
396sub size_allocate { 468sub size_allocate {
397 my ($self, $w, $h) = @_; 469 my ($self, $w, $h) = @_;
398 470
399 $self->w ($w); 471 $self->SUPER::size_allocate ($w, $h);
400 $self->h ($h); 472
401 $h -= $self->{txts}->[1]->{height}; 473 $h -= $tex[1]->{height};
402 $h -= $self->{txts}->[4]->{height}; 474 $h -= $tex[4]->{height};
403 $w -= $self->{txts}->[2]->{width}; 475 $w -= $tex[2]->{width};
404 $w -= $self->{txts}->[3]->{width}; 476 $w -= $tex[3]->{width};
405 477
406 $h = $h < 0 ? 0 : $h; 478 $h = $h < 0 ? 0 : $h;
407 $w = $w < 0 ? 0 : $w; 479 $w = $w < 0 ? 0 : $w;
408 warn "CHILD:$w $h\n"; 480
481 my $child = $self->child;
482
409 $self->child->size_allocate ($w, $h); 483 $child->size_allocate ($w, $h);
410 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 484 $child->move ($tex[3]->{width}, $tex[1]->{height});
411} 485}
412 486
413sub _draw { 487sub _draw {
414 my ($self) = @_; 488 my ($self) = @_;
415 489
416 my ($w, $h) = ($self->w, $self->h); 490 my ($w, $h) = ($self->{w}, $self->{h});
417 my ($cw, $ch) = ($self->child->w, $self->child->h); 491 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
418 492
419 glEnable GL_BLEND; 493 glEnable GL_BLEND;
420 glEnable GL_TEXTURE_2D; 494 glEnable GL_TEXTURE_2D;
421 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 495 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
422 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
423 497
424 my $top = $self->{txts}->[1]; 498 my $top = $tex[1];
425 glBindTexture GL_TEXTURE_2D, $top->{name}; 499 $top->draw_quad (0, 0, $w, $top->{height});
426 500
427 glBegin GL_QUADS;
428 glTexCoord 0, 0; glVertex 0 , 0;
429 glTexCoord 0, 1; glVertex 0 , $top->{height};
430 glTexCoord 1, 1; glVertex $w , $top->{height};
431 glTexCoord 1, 0; glVertex $w , 0;
432 glEnd;
433
434 my $left = $self->{txts}->[3]; 501 my $left = $tex[3];
435 glBindTexture GL_TEXTURE_2D, $left->{name}; 502 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
436 503
437 glBegin GL_QUADS;
438 glTexCoord 0, 0; glVertex 0 , $top->{height};
439 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
440 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
441 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
442 glEnd;
443
444 my $right = $self->{txts}->[2]; 504 my $right = $tex[2];
445 glBindTexture GL_TEXTURE_2D, $right->{name}; 505 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
446 506
447 glBegin GL_QUADS;
448 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
449 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
450 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
451 glTexCoord 1, 0; glVertex $w , $top->{height};
452 glEnd;
453
454 my $bottom = $self->{txts}->[4]; 507 my $bottom = $tex[4];
455 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 508 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
456 509
457 glBegin GL_QUADS; 510 my $bg = $tex[0];
458 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
459 glTexCoord 0, 1; glVertex 0 , $h;
460 glTexCoord 1, 1; glVertex $w , $h;
461 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
462 glEnd;
463
464 my $bg = $self->{txts}->[0];
465 glBindTexture GL_TEXTURE_2D, $bg->{name}; 511 glBindTexture GL_TEXTURE_2D, $bg->{name};
466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 513 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
469 515
470 my $rep_x = $cw / $bg->{width}; 516 my $rep_x = $cw / $bg->{width};
471 my $rep_y = $ch / $bg->{height}; 517 my $rep_y = $ch / $bg->{height};
472 518
473 glBegin GL_QUADS; 519 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
474 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
475 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
476 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
477 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
478 glEnd;
479 520
480 glDisable GL_BLEND; 521 glDisable GL_BLEND;
481 glDisable GL_TEXTURE_2D; 522 glDisable GL_TEXTURE_2D;
482 523
483 $self->child->draw; 524 $self->child->draw;
484 525
485} 526}
486 527
487############################################################################# 528#############################################################################
488 529
489package Crossfire::Client::Widget::Table; 530package CFClient::Widget::Table;
490 531
491our @ISA = Crossfire::Client::Widget::Bin::; 532our @ISA = CFClient::Widget::Bin::;
492 533
493use SDL::OpenGL; 534use SDL::OpenGL;
494 535
495sub add { 536sub add {
496 my ($self, $x, $y, $chld) = @_; 537 my ($self, $x, $y, $chld) = @_;
… …
571 } 612 }
572} 613}
573 614
574############################################################################# 615#############################################################################
575 616
576package Crossfire::Client::Widget::VBox; 617package CFClient::Widget::VBox;
577 618
578our @ISA = Crossfire::Client::Widget::Container::; 619our @ISA = CFClient::Widget::Container::;
579 620
580use SDL::OpenGL; 621use SDL::OpenGL;
622
623sub size_request {
624 my ($self) = @_;
625
626 my @alloc = map [$_->size_request], @{$self->{children}};
627
628 (
629 (List::Util::max map $_->[0], @alloc),
630 (List::Util::sum map $_->[1], @alloc),
631 )
632}
581 633
582sub size_allocate { 634sub size_allocate {
583 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
584 636
585 $self->w ($w); 637 $self->w ($w);
… …
618 $y += $h; 670 $y += $h;
619 } 671 }
620 } 672 }
621} 673}
622 674
623sub _draw {
624 my ($self) = @_;
625
626 my ($x, $y);
627 for (@{$self->{children} || []}) {
628 $_->draw;
629 $y += $_->h;
630 }
631}
632
633############################################################################# 675#############################################################################
634 676
635package Crossfire::Client::Widget::Label; 677package CFClient::Widget::Label;
636 678
637our @ISA = Crossfire::Client::Widget::; 679our @ISA = CFClient::Widget::;
638 680
639use SDL::OpenGL; 681use SDL::OpenGL;
640 682
641sub new { 683sub new {
642 my ($class, $x, $y, $z, $height, $text) = @_; 684 my ($class, %arg) = @_;
643 685
644 # TODO: color, and make height, xyz etc. optional 686 # TODO: color, and make height, xyz etc. optional
645 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 687 my $self = $class->SUPER::new (
688 color => [1, 1, 1],
689 height => $::FONTSIZE,
690 text => "",
691 layout => new CFClient::Layout,
692 %arg
693 );
646 694
647 $self->set_text ($text); 695 $self->set_text ($self->{text});
648 696
649 $self 697 $self
650} 698}
651 699
652sub set_text { 700sub set_text {
653 my ($self, $text) = @_; 701 my ($self, $text) = @_;
654 702
655 $self->{text} = $text; 703 $self->{text} = $text;
656 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 704 $self->{layout}->set_markup ($text);
657 705
658 $self->update; 706 delete $self->{texture};
659} 707}
660 708
661sub get_text { 709sub get_text {
662 my ($self, $text) = @_; 710 my ($self, $text) = @_;
663 711
… …
665} 713}
666 714
667sub size_request { 715sub size_request {
668 my ($self) = @_; 716 my ($self) = @_;
669 717
670 ( 718 $self->{layout}->set_width;
719 $self->{layout}->set_height ($self->{height});
720 $self->{layout}->size
721# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
722# (
671 $self->{texture}{width}, 723# $self->{texture}{width},
672 $self->{texture}{height}, 724# $self->{texture}{height},
673 ) 725# )
726# } else {
727# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
728#
729# ($w, $h)
730# }
731}
732
733sub size_allocate {
734 my ($self, $w, $h) = @_;
735
736 $self->SUPER::size_allocate ($w, $h);
737 delete $self->{texture};
674} 738}
675 739
676sub _draw { 740sub _draw {
677 my ($self) = @_; 741 my ($self) = @_;
678 742
679 my $tex = $self->{texture}; 743 my $tex = $self->{texture} ||= do {
744 $self->{layout}->set_width ($self->{w});
745 new_from_layout CFClient::Texture $self->{layout};
746 };
680 747
681 glEnable GL_BLEND; 748 glEnable GL_BLEND;
682 glEnable GL_TEXTURE_2D; 749 glEnable GL_TEXTURE_2D;
683 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 750 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
684 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
685 glBindTexture GL_TEXTURE_2D, $tex->{name};
686 752
687 glColor 1, 0, 0, 1; # TODO color 753 glColor @{$self->{color}};
688 754
689 glBegin GL_QUADS; 755 $tex->draw_quad (0, 0);
690 glTexCoord 0, 0; glVertex 0 , 0;
691 glTexCoord 0, 1; glVertex 0 , $tex->{height};
692 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
693 glTexCoord 1, 0; glVertex $tex->{width}, 0;
694 glEnd;
695 756
696 glDisable GL_BLEND; 757 glDisable GL_BLEND;
697 glDisable GL_TEXTURE_2D; 758 glDisable GL_TEXTURE_2D;
698} 759}
699 760
700############################################################################# 761#############################################################################
701 762
702package Crossfire::Client::Widget::TextEntry; 763package CFClient::Widget::Entry;
703 764
704our @ISA = Crossfire::Client::Widget::Label::; 765our @ISA = CFClient::Widget::Label::;
705 766
706use SDL; 767use SDL;
707use SDL::OpenGL; 768use SDL::OpenGL;
708 769
709sub key_down { 770sub key_down {
710 my ($self, $ev) = @_; 771 my ($self, $ev) = @_;
711 772
712 my $mod = $ev->key_mod; 773 my $mod = $ev->key_mod;
713 my $sym = $ev->key_sym; 774 my $sym = $ev->key_sym;
714 775
715 $ev->set_unicode (1);
716 my $uni = $ev->key_unicode; 776 my $uni = $ev->key_unicode;
717 777
718 my $text = $self->get_text; 778 my $text = $self->get_text;
719 779
720 if ($sym == SDLK_BACKSPACE) { 780 if ($sym == SDLK_BACKSPACE) {
721 substr $text, -1, 1, ''; 781 substr $text, -1, 1, '';
722
723 } elsif ($uni) { 782 } elsif ($uni) {
724 $text .= chr $uni; 783 $text .= chr $uni;
725 } 784 }
785
726 $self->set_text ($text); 786 $self->set_text ($text);
727} 787}
728 788
729############################################################################# 789sub button_down {
790 my ($self, $ev) = @_;
730 791
792 $self->focus_in;
793}
794
795sub mouse_motion {
796 my ($self, $ev, $x, $y) = @_;
797 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
798}
799
800sub _draw {
801 my ($self) = @_;
802
803 if ($FOCUS == $self) {
804 glColor 1, 1, 1;
805 } else {
806 glColor 0.7, 0.7, 0.7;
807 }
808
809 glBegin GL_QUADS;
810 glVertex 0 , 0;
811 glVertex 0 , $self->{h} - 1;
812 glVertex $self->{w} - 1, $self->{h} - 1;
813 glVertex $self->{w} - 1, 0;
814 glEnd;
815
816 $self->SUPER::_draw;
817}
818
819#############################################################################
820
731package Crossfire::Client::Widget::MapWidget; 821package CFClient::Widget::MapWidget;
732 822
733use strict; 823use strict;
734 824
735use List::Util qw(min max); 825use List::Util qw(min max);
736 826
737use SDL; 827use SDL;
738use SDL::OpenGL; 828use SDL::OpenGL;
739use SDL::OpenGL::Constants; 829use SDL::OpenGL::Constants;
740 830
741our @ISA = Crossfire::Client::Widget::; 831our @ISA = CFClient::Widget::;
832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 z => -1,
838 list => (glGenLists 1),
839 @_
840 )
841}
742 842
743sub key_down { 843sub key_down {
744 print "MAPKEYDOWN\n"; 844 print "MAPKEYDOWN\n";
745} 845}
746 846
747sub key_up { 847sub key_up {
748} 848}
749 849
750sub size_request { 850sub size_request {
751 851 (
852 1 + int $::WIDTH / 32,
853 1 + int $::HEIGHT / 32,
854 )
752} 855}
753 856
754sub size_allocate { 857sub update {
858 my ($self) = @_;
859
860 $self->{need_update} = 1;
755} 861}
756 862
757sub _draw { 863sub _draw {
758 my ($self) = @_; 864 my ($self) = @_;
759 865
866 if (delete $self->{need_update}) {
867 glNewList $self->{list}, GL_COMPILE;
868
760 my $mx = $::CONN->{mapx}; 869 my $mx = $::CONN->{mapx};
761 my $my = $::CONN->{mapy}; 870 my $my = $::CONN->{mapy};
762 871
763 my $map = $::CONN->{map}; 872 my $map = $::CONN->{map};
764 873
765 my ($xofs, $yofs); 874 my ($xofs, $yofs);
766 875
767 my $sw = 1 + int $::WIDTH / 32; 876 my $sw = 1 + int $::WIDTH / 32;
768 my $sh = 1 + int $::HEIGHT / 32; 877 my $sh = 1 + int $::HEIGHT / 32;
769 878
770 if ($::CONN->{mapw} > $sw) { 879 if ($::CONN->{mapw} > $sw) {
771 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 880 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
772 } else { 881 } else {
773 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 882 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
774 } 883 }
775 884
776 if ($::CONN->{maph} > $sh) { 885 if ($::CONN->{maph} > $sh) {
777 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 886 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
778 } else { 887 } else {
779 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 888 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
780 } 889 }
781 890
782 glEnable GL_TEXTURE_2D; 891 glEnable GL_TEXTURE_2D;
783 glEnable GL_BLEND; 892 glEnable GL_BLEND;
784 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
785 894
786 my $sw4 = ($sw + 3) & ~3; 895 my $sw4 = ($sw + 3) & ~3;
787 my $lighting = "\x00" x ($sw4 * $sh); 896 my $darkness = "\x00" x ($sw4 * $sh);
788 897
789 for my $x (0 .. $sw - 1) { 898 for my $x (0 .. $sw - 1) {
899 my $row = $map->[$x + $xofs];
790 for my $y (0 .. $sh - 1) { 900 for my $y (0 .. $sh - 1) {
791 901
792 my $cell = $map->[$x + $xofs][$y + $yofs] 902 my $cell = $row->[$y + $yofs]
793 or next; 903 or next;
794 904
795 my $darkness = $cell->[0] * (1 / 255); 905 my $dark = $cell->[0];
796 if ($darkness < 0) { 906 if ($dark < 0) {
797 $darkness = 0.15; 907 substr $darkness, $y * $sw4 + $x, 1, chr 224;
908 } else {
909 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
798 } 910 }
799 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
800 911
801 for my $num (grep $_, @$cell[1,2,3]) { 912 for my $num (grep $_, @$cell[1,2,3]) {
802 my $tex = $::CONN->{face}[$num]{texture} || next; 913 my $tex = $::CONN->{face}[$num]{texture} || next;
803 914
804 glBindTexture GL_TEXTURE_2D, $tex->{name};
805
806 my $w = $tex->{width}; 915 my $w = $tex->{width};
807 my $h = $tex->{height}; 916 my $h = $tex->{height};
808 917
809 my $px = ($x + 1) * 32 - $w; 918 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
810 my $py = ($y + 1) * 32 - $h;
811
812 glBegin GL_QUADS;
813 glTexCoord 0, 0; glVertex $px , $py;
814 glTexCoord 0, 1; glVertex $px , $py + $h;
815 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
816 glTexCoord 1, 0; glVertex $px + $w, $py;
817 glEnd; 919 }
818 } 920 }
819 } 921 }
820 }
821 922
822# if (1) { # higher quality darkness 923# if (1) { # higher quality darkness
823# $lighting =~ s/(.)/$1$1$1/gs; 924# $lighting =~ s/(.)/$1$1$1/gs;
824# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 925# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
825# 926#
… …
827# 928#
828# $lighting = $pb->get_pixels; 929# $lighting = $pb->get_pixels;
829# $lighting =~ s/(.)../$1/gs; 930# $lighting =~ s/(.)../$1/gs;
830# } 931# }
831 932
832 $lighting = new Crossfire::Client::Texture
833 width => $sw4,
834 height => $sh,
835 data => $lighting,
836 internalformat => GL_ALPHA4,
837 format => GL_ALPHA;
838
839 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 933 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
840 glColor 0, 0, 0, 0.75;
841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
842 glBindTexture GL_TEXTURE_2D, $lighting->{name};
843 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
844 glBegin GL_QUADS;
845 glTexCoord 0, 0; glVertex 0 , 0;
846 glTexCoord 0, 1; glVertex 0 , $sh * 32;
847 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
848 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
849 glEnd;
850 935
936 $darkness = new CFClient::Texture
937 width => $sw4,
938 height => $sh,
939 data => $darkness,
940 internalformat => GL_ALPHA,
941 format => GL_ALPHA;
942
943 glColor 0.45, 0.45, 0.45, 1;
944 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
945
851 glDisable GL_TEXTURE_2D; 946 glDisable GL_TEXTURE_2D;
852 glDisable GL_BLEND; 947 glDisable GL_BLEND;
948
949 glEndList;
950 }
951
952 glCallList $self->{list};
853} 953}
854 954
855my %DIR = ( 955my %DIR = (
856 SDLK_KP8, [1, "north"], 956 SDLK_KP8, [1, "north"],
857 SDLK_KP9, [2, "northeast"], 957 SDLK_KP9, [2, "northeast"],
… …
903 } 1003 }
904} 1004}
905 1005
906############################################################################# 1006#############################################################################
907 1007
908package Crossfire::Client::Widget::Animator; 1008package CFClient::Widget::Animator;
909 1009
910use SDL::OpenGL; 1010use SDL::OpenGL;
911 1011
912our @ISA = Crossfire::Client::Widget::Bin::; 1012our @ISA = CFClient::Widget::Bin::;
913 1013
914sub moveto { 1014sub moveto {
915 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
916 1016
917 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1017 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
918 $self->{speed} = 0.2; 1018 $self->{speed} = 0.001;
919 $self->{time} = 1; 1019 $self->{time} = 1;
920 1020
921 ::animation_start $self; 1021 ::animation_start $self;
922} 1022}
923 1023
… …
938 1038
939sub _draw { 1039sub _draw {
940 my ($self) = @_; 1040 my ($self) = @_;
941 1041
942 glPushMatrix; 1042 glPushMatrix;
943 glRotate $self->{time} * 10000, 0, 1, 0; 1043 glRotate $self->{time} * 1000, 0, 1, 0;
944 $self->{children}[0]->draw; 1044 $self->{children}[0]->draw;
945 glPopMatrix; 1045 glPopMatrix;
946} 1046}
947 1047
9481; 1048#############################################################################
949 1049
1050package CFClient::Widget::Toplevel;
1051
1052our @ISA = CFClient::Widget::Container::;
1053
1054sub size_request {
1055 ($::WIDTH, $::HEIGHT)
1056}
1057
1058sub size_allocate {
1059 my ($self, $w, $h) = @_;
1060
1061 $self->SUPER::size_allocate ($w, $h);
1062
1063 $_->size_allocate ($_->size_request)
1064 for @{$self->{children}};
1065}
1066
1067sub translate {
1068 my ($self, $x, $y) = @_;
1069
1070 ($x, $y)
1071}
1072
1073sub update {
1074 my ($self) = @_;
1075
1076 $self->size_allocate ($self->size_request);
1077 ::refresh ();
1078}
1079
1080sub add {
1081 my ($self, $widget) = @_;
1082
1083 $self->SUPER::add ($widget);
1084
1085 $widget->size_allocate ($widget->size_request);
1086}
1087
1088sub draw {
1089 my ($self) = @_;
1090
1091 $self->_draw;
1092}
1093
1094#############################################################################
1095
1096package CFClient::Widget;
1097
1098$TOPLEVEL = new CFClient::Widget::Toplevel;
1099
11001
1101

Diff Legend

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