~ubuntu-branches/debian/experimental/mednafen/experimental

Viewing changes to src/drivers/logdebugger.cpp

Committer: Package Import Robot
Author(s): Stephen Kitt
Date: 2012-11-19 07:00:37 UTC
mfrom: (1.2.12)
Revision ID: package-import@ubuntu.com-20121119070037-jvknrm13zvim88oc

Tags: 0.9.26-1

* New upstream WIP version.
* Change priority to "extra" to match libvorbisidec1's.
* Drop "DM-Upload-Allowed" since it is no longer appropriate.
* Refresh patches, replacing MPC_STATUS_FAIL constant from older mpcdec
versions.

files added:
src/FileStream.cpp

src/FileStream.h

src/cdrom/audioreader_opus.cpp

src/cdrom/audioreader_opus.h

src/drivers/Joystick.cpp

src/drivers/Joystick.h

src/drivers/Joystick_DOS_Standard.cpp

src/drivers/Joystick_DOS_Standard.h

src/drivers/Joystick_DX5.cpp

src/drivers/Joystick_DX5.h

src/drivers/Joystick_Linux.cpp

src/drivers/Joystick_Linux.h

src/drivers/Joystick_SDL.cpp

src/drivers/Joystick_SDL.h

src/drivers/Joystick_XInput.cpp

src/drivers/Joystick_XInput.h

src/drivers/Keyboard.h

src/hw_cpu/huc6280/dis6280.cpp

src/hw_cpu/huc6280/dis6280.h

src/psx/input/dualshock.cpp

src/psx/input/dualshock.h

src/psx/input/guncon.cpp

src/psx/input/guncon.h

src/psx/input/justifier.cpp

src/psx/input/justifier.h

src/psx/input/negcon.cpp

src/psx/input/negcon.h

files removed:
src/dis6280.cpp

src/dis6280.h

src/drivers/joystick.cpp

src/drivers/joystick.h

src/hw_cpu/.Tpo

src/psx/.Tpo

src/snes/src/obj

src/sound.h

src/sound/sound.cpp

files modified:
.pc/use-system-mpcdec.patch/configure.ac

.pc/use-system-mpcdec.patch/src/Makefile.am

.pc/use-system-mpcdec.patch/src/cdrom/audioreader.cpp

.pc/use-system-tremor.patch/configure.ac

.pc/use-system-tremor.patch/src/Makefile.am

.pc/use-system-tremor.patch/src/cdrom/audioreader.cpp

ChangeLog

Documentation/docgen.inc

Documentation/gb.html

Documentation/gba.html

Documentation/gg.html

Documentation/lynx.html

Documentation/md.html

Documentation/mednafen.html

Documentation/mednafen.php

Documentation/modules.def

Documentation/nes.html

Documentation/nes.php

Documentation/netplay.html

Documentation/ngp.html

Documentation/pce.html

Documentation/pce_fast.html

Documentation/pcfx.html

Documentation/psx.html

Documentation/settings.def

Documentation/sms.html

Documentation/snes.html

Documentation/vb.html

Documentation/wswan.html

configure

configure.ac

debian/changelog

debian/control

debian/patches/use-system-mpcdec.patch

debian/patches/use-system-tremor.patch

include/config.h.in

include/config.h.in~

src/Makefile.am

src/Makefile.in

src/MemoryStream.cpp

src/MemoryStream.h

src/Stream.cpp

src/Stream.h

src/cdplay.cpp

src/cdrom/CDAccess.cpp

src/cdrom/CDAccess.h

src/cdrom/CDAccess_Image.cpp

src/cdrom/CDAccess_Image.h

src/cdrom/audioreader.cpp

src/cdrom/audioreader.h

src/cdrom/cdromif.cpp

src/cdrom/cdromif.h

src/debug.h

src/drivers/Makefile.am

src/drivers/Makefile.in

src/drivers/cheat.cpp

src/drivers/cheat.h

src/drivers/console.cpp

src/drivers/console.h

src/drivers/debugger.cpp

src/drivers/debugger.h

src/drivers/fps.cpp

src/drivers/gfxdebugger.cpp

src/drivers/gfxdebugger.h

src/drivers/help.cpp

src/drivers/help.h

src/drivers/input-config.cpp

src/drivers/input-config.h

src/drivers/input-default-buttons.h

src/drivers/input.cpp

src/drivers/input.h

src/drivers/logdebugger.cpp

src/drivers/logdebugger.h

src/drivers/main.cpp

src/drivers/main.h

src/drivers/memdebugger.cpp

src/drivers/memdebugger.h

src/drivers/netplay.cpp

src/drivers/netplay.h

src/drivers/nnx.cpp

src/drivers/nnx.h

src/drivers/nongl.cpp

src/drivers/nongl.h

src/drivers/opengl.cpp

src/drivers/opengl.h

src/drivers/overlay.cpp

src/drivers/overlay.h

src/drivers/prompt.cpp

src/drivers/prompt.h

src/drivers/shader.cpp

src/drivers/shader.h

src/drivers/video-state.cpp

src/drivers/video.cpp

src/drivers/video.h

src/gb/gb.cpp

src/gb/memory.cpp

src/gba/GBA.cpp

src/general.cpp

src/git.h

src/hw_cpu/Makefile.am

src/hw_cpu/Makefile.in

src/hw_video/huc6270/vdc.cpp

src/lynx/cart.cpp

src/lynx/rom.cpp

src/lynx/system.cpp

src/md/cd/cd.cpp

src/md/debug.cpp

src/md/genio.cpp

src/md/system.cpp

src/mednafen-driver.h

src/mednafen.cpp

src/nes/boards/simple.cpp

src/nes/filter.cpp

src/nes/ines-correct.inc

src/nes/ines.cpp

src/nes/ines.h

src/nes/input.cpp

src/nes/input/arkanoid.cpp

src/nes/input/cursor.cpp

src/nes/input/oekakids.cpp

src/nes/input/shadow.cpp

src/nes/input/zapper.cpp

src/ngp/neopop.cpp

src/pce/debug.cpp

src/pce/huc.cpp

src/pce/input.cpp

src/pce_fast/huc.cpp

src/pce_fast/input.cpp

src/pce_fast/vdc.cpp

src/pcfx/input.cpp

src/psx/Makefile.am

src/psx/Makefile.in

src/psx/PSX-TODO

src/psx/cdc.cpp

src/psx/cdc.h

src/psx/cpu.cpp

src/psx/cpu.h

src/psx/debug.cpp

src/psx/dis.cpp

src/psx/dma.cpp

src/psx/frontio.cpp

src/psx/frontio.h

src/psx/gpu.cpp

src/psx/gpu.h

src/psx/gpu_command_table.inc

src/psx/gpu_line.inc

src/psx/gpu_polygon.inc

src/psx/input/dualanalog.cpp

src/psx/input/gamepad.cpp

src/psx/input/gamepad.h

src/psx/input/memcard.cpp

src/psx/mdec.cpp

src/psx/psx.cpp

src/psx/psx.h

src/psx/spu.cpp

src/psx/spu_fir_table.inc

src/psx/spu_reverb.inc

src/psx/timer.cpp

src/psx/timer.h

src/qtrecord.cpp

src/settings.cpp

src/settings.h

src/sexyal/drivers/dsound.cpp

src/sexyal/sexyal.cpp

src/sexyal/sexyal.h

src/sms/romdb.cpp

src/sms/system.cpp

src/snes/interface.cpp

src/snes/src/dsp/sdsp/sdsp.cpp

src/snes/src/lib/nall/static.hpp

src/snes/src/lib/nall/stdint.hpp

src/snes/src/lib/nall/varint.hpp

src/sound/Makefile.am

src/sound/Makefile.in

src/state.h

src/tests.cpp

src/types.h

src/vb/vb.cpp

src/vb/vip_draw.inc

src/video/font-data.h

src/video/surface.cpp

src/video/surface.h

src/video/text.cpp

src/wswan/main.cpp

Show diffs side-by-side

added added

removed removed

src/drivers/logdebugger.cpp

105

}

106

}

107

108

#define MK_COLOR_A(r,g,b,a) ( ((a)<<surface->format->Ashift) | ((r)<<surface->format->Rshift) | ((g) << surface->format->Gshift) | ((b) << surface->format->Bshift))

108

#define MK_COLOR_A(r,g,b,a) ( pf_cache.MakeColor(r, g, b, a) )

109

110

// Call this function from the main thread

111

void LogDebugger_Draw(SDL_Surface *surface, const SDL_Rect *rect, const SDL_Rect *screen_rect)

111

void LogDebugger_Draw(MDFN_Surface *surface, const MDFN_Rect *rect, const MDFN_Rect *screen_rect)

112

{

113

if(!IsActive) return;

114

115

LockGameMutex(1);

116

117

uint32 * pixels = (uint32 *)surface->pixels;

118

uint32 pitch32 = surface->pitch >> 2;

117

const MDFN_PixelFormat pf_cache = surface->format;

118

uint32 * pixels = surface->pixels;

119

uint32 pitch32 = surface->pitchinpix;

119

120

char logmessage[256];

120

121

122

trio_snprintf(logmessage, 256, "%s (%d messages)", LoggingActive ? (UTF8*)"Logging Enabled" : (UTF8*)"Logging Disabled", (int)WhichLog->entries.size());

122

DrawTextTrans(pixels, surface->pitch, rect->w, (UTF8*)logmessage, MK_COLOR_A(0x20, 0xFF, 0x20, 0xFF), 1, MDFN_FONT_6x13_12x13);

123

DrawTextTrans(pixels, surface->pitchinpix << 2, rect->w, (UTF8*)logmessage, MK_COLOR_A(0x20, 0xFF, 0x20, 0xFF), 1, MDFN_FONT_6x13_12x13);

123

124

pixels += 13 * pitch32;

124

125

126

std::map<std::string, LogInstance>::iterator dl_iter;

135

136

if(&dl_iter->second == WhichLog)

136

137

group_color = MK_COLOR_A(0xFF, 0x80, 0x80, 0xFF);

137

138

groups_line += 6 + DrawTextTrans(groups_line, surface->pitch, rect->w, (UTF8*)group_string, group_color, 0, MDFN_FONT_6x13_12x13);

139

groups_line += 6 + DrawTextTrans(groups_line, surface->pitchinpix << 2, rect->w, (UTF8*)group_string, group_color, 0, MDFN_FONT_6x13_12x13);

139

140

141

// printf("%s\n", dl_iter->first.c_str());

141

142

}

153

154

char tmpbuf[64];

154

155

156

trio_snprintf(tmpbuf, 64, "%d", i);

156

typelen = DrawTextTrans(pixels, surface->pitch, rect->w, (UTF8*)tmpbuf, MK_COLOR_A(0x80, 0x80, 0xD0, 0xFF), FALSE, MDFN_FONT_5x7);

157

typelen = DrawTextTrans(pixels, surface->pitchinpix << 2, rect->w, (UTF8*)tmpbuf, MK_COLOR_A(0x80, 0x80, 0xD0, 0xFF), FALSE, MDFN_FONT_5x7);

157

158

typelen += 1;

158

159

typelen += DrawTextTrans(pixels + typelen, surface->pitch, rect->w - typelen, (UTF8*)WhichLog->entries[i].type, MK_COLOR_A(0xFF, 0x40, 0x40, 0xFF), FALSE, MDFN_FONT_6x13_12x13);

160

typelen += DrawTextTrans(pixels + typelen, surface->pitchinpix << 2, rect->w - typelen, (UTF8*)WhichLog->entries[i].type, MK_COLOR_A(0xFF, 0x40, 0x40, 0xFF), FALSE, MDFN_FONT_6x13_12x13);

160

161

typelen += 5;

161

DrawTextTrans(pixels + typelen, surface->pitch, rect->w - typelen, (UTF8*)WhichLog->entries[i].text, lifecolors[i & 3], FALSE, MDFN_FONT_6x13_12x13);

162

DrawTextTrans(pixels + typelen, surface->pitchinpix << 2, rect->w - typelen, (UTF8*)WhichLog->entries[i].text, lifecolors[i & 3], FALSE, MDFN_FONT_6x13_12x13);

162

163

pixels += pitch32 * 13;

163

164

}

164

165

LockGameMutex(0);

Older »